🎨 art from idea problems

README.md

@@ -43,7 +43,7 @@
 [Spring Oxygen](https://github.com/isxcode/spring-oxygen) is rapid development integration framework for [Spring](https://spring.io/) .
 **Important statement, enterprise-level development is recommended to be used with caution!**
 For instructions on use, please check the [website](https://spring-oxygen.isxcode.com) carefully.
-Welcome to develop and maintain together, please follow the [github development](https://spring-oxygen.isxcode.com/#/en-us/contributing) specification.
+Welcome to develop and maintain together, please follow the [GitHub development](https://spring-oxygen.isxcode.com/#/en-us/contributing) specification.
 
 ## 📦 Installation
 

docs/_homepage.md

@@ -43,7 +43,7 @@
 [Spring Oxygen](https://github.com/isxcode/spring-oxygen) is rapid development integration framework for [Spring](https://spring.io/) .
 **Important statement, enterprise-level development is recommended to be used with caution!**
 For instructions on use, please check the [website](https://spring-oxygen.isxcode.com) carefully.
-Welcome to develop and maintain together, please follow the [github development](https://spring-oxygen.isxcode.com/#/en-us/contributing) specification.
+Welcome to develop and maintain together, please follow the [GitHub development](https://spring-oxygen.isxcode.com/#/en-us/contributing) specification.
 
 ## 📦 Installation
 

spring-oxygen-core/src/main/java/com/isxcode/oxygen/core/command/CommandUtils.java

@@ -18,9 +18,9 @@
 @Slf4j
 public class CommandUtils {
 
-	public static String LINUX_BASH = "/bin/sh";
-	public static String WINDOWS_CMD = "C:\\Windows\\System32\\cmd.exe";
-	public static long DEFAULT_WAITING_TIME = 60000;
+	public static final String LINUX_BASH = "/bin/sh";
+	public static final String WINDOWS_CMD = "C:\\Windows\\System32\\cmd.exe";
+	public static final long DEFAULT_WAITING_TIME = 60000;
 
 	/**
 	 * execute command to log file

spring-oxygen-core/src/main/java/com/isxcode/oxygen/core/file/FileUtils.java

@@ -4,7 +4,10 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.*;
+import java.nio.file.Files;
+import java.nio.file.OpenOption;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.springframework.core.io.DefaultResourceLoader;

spring-oxygen-core/src/main/java/com/isxcode/oxygen/core/secret/RsaUtils.java

@@ -91,14 +91,6 @@ public KeyPair generateKeyPair() throws OxygenException {
 			KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance(SecretConstants.RSA);
 			keyPairGenerator.initialize(2048);
 			return keyPairGenerator.generateKeyPair();
-
-			//            System.out.println("publicKey:");
-			//
-			// System.out.println(Base64.getEncoder().encodeToString(keyPair.getPublic().getEncoded()));
-			//
-			//            System.out.println("privateKey:");
-			//
-			// System.out.println(Base64.getEncoder().encodeToString(keyPair.getPrivate().getEncoded()));
 		} catch (NoSuchAlgorithmException e) {
 			log.error(e.getMessage());
 			throw new OxygenException(e.getMessage());

spring-oxygen-core/src/test/java/com/isxcode/oxygen/core/FreemarkerUtilsTests.java

@@ -5,6 +5,8 @@
 import com.isxcode.oxygen.core.file.FileUtils;
 import com.isxcode.oxygen.core.freemarker.FreemarkerUtils;
 import com.isxcode.oxygen.core.pojo.Dog;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.freemarker.FreeMarkerAutoConfiguration;
@@ -33,6 +35,10 @@ public class FreemarkerUtilsTests {
 	@Test
 	public void testContentToFile() {
 
+		if (Files.exists(Paths.get("freemarker1.txt"))) {
+			FileUtils.recursionDeleteFile("freemarker1.txt");
+		}
+
 		try {
 			FreemarkerUtils.contentToFile(templateContent, dog, "freemarker1.txt");
 		} catch (OxygenException e) {
@@ -55,6 +61,10 @@ public void testContentToString() {
 	@Test
 	public void testTemplateToFile() {
 
+		if (Files.exists(Paths.get("freemarker2.txt"))) {
+			FileUtils.recursionDeleteFile("freemarker2.txt");
+		}
+
 		try {
 			FreemarkerUtils.templateToFile(templateName, dog, "freemarker2.txt");
 		} catch (OxygenException e) {

spring-oxygen-core/src/test/java/com/isxcode/oxygen/core/SecretUtilsTasks.java → spring-oxygen-core/src/test/java/com/isxcode/oxygen/core/SecretUtilsTest.java

@@ -12,7 +12,7 @@
 
 @SpringBootTest
 @ContextConfiguration(classes = {OxygenCoreAutoConfiguration.class, FreeMarkerConfigurer.class})
-public class SecretUtilsTasks {
+public class SecretUtilsTest {
 
 	@Test
 	public void testAesNoKey() {

spring-oxygen-flysql/build.gradle

@@ -16,5 +16,5 @@ dependencies {
     runtimeOnly 'com.oracle.database.jdbc:ojdbc8'
 
     // jasypt
-    compile 'com.github.ulisesbocchio:jasypt-spring-boot-starter:3.0.3'
+    compile 'com.github.ulisesbocchio:jasypt-spring-boot-starter:3.0.4'
 }

spring-oxygen-flysql/src/main/java/com/isxcode/oxygen/flysql/common/BaseEntity.java

@@ -16,9 +16,6 @@
 @Data
 public class BaseEntity {
 
-	//    @RowId
-	//    private String id;
-
 	@CreatedDate
 	@JsonDeserialize(using = LocalDateTimeDeserializer.class)
 	@JsonSerialize(using = LocalDateTimeSerializer.class)

spring-oxygen-flysql/src/main/java/com/isxcode/oxygen/flysql/common/LocalDateDeserializer.java

@@ -1,7 +1,6 @@
 package com.isxcode.oxygen.flysql.common;
 
 import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import java.io.IOException;
@@ -17,8 +16,7 @@
 public class LocalDateDeserializer extends JsonDeserializer<LocalDate> {
 
 	@Override
-	public LocalDate deserialize(JsonParser p, DeserializationContext ctxt)
-			throws IOException, JsonProcessingException {
+	public LocalDate deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
 
 		DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
 		return LocalDate.parse(p.getText(), dtf);

spring-oxygen-flysql/src/main/java/com/isxcode/oxygen/flysql/common/LocalDateTimeDeserializer.java

@@ -1,7 +1,6 @@
 package com.isxcode.oxygen.flysql.common;
 
 import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import java.io.IOException;
@@ -17,8 +16,7 @@
 public class LocalDateTimeDeserializer extends JsonDeserializer<LocalDateTime> {
 
 	@Override
-	public LocalDateTime deserialize(JsonParser p, DeserializationContext ctxt)
-			throws IOException, JsonProcessingException {
+	public LocalDateTime deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
 
 		return LocalDateTime.ofEpochSecond(p.getLongValue() / 1000, 0, ZoneOffset.ofHours(8));
 	}

spring-oxygen-flysql/src/main/java/com/isxcode/oxygen/flysql/core/AbstractSqlBuilder.java

@@ -28,13 +28,13 @@
 @Slf4j
 public abstract class AbstractSqlBuilder<T> implements FlysqlCondition<T> {
 
-	public List<SqlCondition> sqlConditions = new ArrayList<>();
+	public final List<SqlCondition> sqlConditions = new ArrayList<>();
 
-	public List<String> sqlOrderByConditions = new ArrayList<>();
+	public final List<String> sqlOrderByConditions = new ArrayList<>();
 
-	public Map<String, ColumnProperties> columnsMap;
+	public final Map<String, ColumnProperties> columnsMap;
 
-	public DataBaseType dataBaseType;
+	public final DataBaseType dataBaseType;
 
 	public AbstractSqlBuilder(Class<?> genericType, DataBaseType dataBaseType) {
 

spring-oxygen-flysql/src/main/java/com/isxcode/oxygen/flysql/core/FlysqlExecute.java

@@ -167,6 +167,10 @@ public void doUpdate() {
 						FlysqlConstants.LAST_MODIFIED_DATE,
 						addSingleQuote(
 								DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(LocalDateTime.now()))));
+		executeUpdate();
+	}
+
+	private void executeUpdate() {
 		String sqlString =
 				parseSqlConditions(initUpdateSql(), sqlConditions, sqlOrderByConditions, "UPADTE");
 
@@ -247,17 +251,7 @@ public void doIsDelete() {
 						addSingleQuote(
 								DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(LocalDateTime.now()))));
 		sqlConditions.add(new SqlCondition(UPDATE, FlysqlConstants.IS_DELETE_COL, "1"));
-		String sqlString =
-				parseSqlConditions(initUpdateSql(), sqlConditions, sqlOrderByConditions, "UPADTE");
-
-		printSql(sqlString);
-
-		try {
-			flysqlKey.getJdbcTemplate().update(sqlString);
-		} catch (BadSqlGrammarException e) {
-			log.error(e.getMessage());
-			throw new FlysqlException(e.getCause().getMessage());
-		}
+		executeUpdate();
 	}
 
 	@Override

spring-oxygen-flysql/src/main/java/com/isxcode/oxygen/flysql/enums/OrderType.java

@@ -2,7 +2,6 @@
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
-import lombok.Setter;
 
 /**
  * 排序
@@ -20,5 +19,5 @@ public enum OrderType {
 	ASC("asc"),
 	;
 
-	@Getter @Setter private String orderType;
+	@Getter private final String orderType;
 }

spring-oxygen-flysql/src/main/java/com/isxcode/oxygen/flysql/package-info.java

@@ -14,8 +14,3 @@
  * limitations under the License.
  */
 package com.isxcode.oxygen.flysql;
-
-/**
- * 通过FlysqlAutoConfiguration初始化Flysql对象。初始化所有的template对象（jdbcTemplate/mongoTemplate） 接着用户指定数据库类型和名称
- * 生成指定的FlysqlBuilder
- */

spring-oxygen-flysql/src/main/java/com/isxcode/oxygen/flysql/parse/OracleSqlValue.java

@@ -30,9 +30,7 @@ public String getLocalDateTimeValue(String val) {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		try {
-			return "TO_DATE('"
-					+ sdf2.format(sdf.parse(String.valueOf(val)))
-					+ "', 'YYYY-MM-DD HH24:MI:SS')";
+			return "TO_DATE('" + sdf2.format(sdf.parse(val)) + "', 'YYYY-MM-DD HH24:MI:SS')";
 		} catch (ParseException e) {
 			return null;
 		}

spring-oxygen-flysql/src/main/java/com/isxcode/oxygen/flysql/parse/SqlServerSqlValue.java

@@ -34,7 +34,7 @@ public String getLocalDateTimeValue(String val) {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
 		try {
-			return "N'" + sdf2.format(sdf.parse(String.valueOf(val))) + "'";
+			return "N'" + sdf2.format(sdf.parse(val)) + "'";
 		} catch (ParseException e) {
 			return null;
 		}

spring-oxygen-flysql/src/main/java/com/isxcode/oxygen/flysql/response/GlobalExceptionAdvice.java

@@ -1,6 +1,7 @@
 package com.isxcode.oxygen.flysql.response;
 
 import com.isxcode.oxygen.flysql.common.BaseResponse;
+import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
@@ -96,11 +97,12 @@ public ResponseEntity<BaseResponse<?>> allException(Exception exception) {
 	}
 
 	@Override
+	@NonNull
 	protected ResponseEntity<Object> handleMethodArgumentNotValid(
 			MethodArgumentNotValidException ex,
-			HttpHeaders headers,
-			HttpStatus status,
-			WebRequest request) {
+			@NonNull HttpHeaders headers,
+			@NonNull HttpStatus status,
+			@NonNull WebRequest request) {
 		ObjectError objectError = ex.getBindingResult().getAllErrors().get(0);
 		return new ResponseEntity<>(
 				new BaseResponse<>("400", objectError.getDefaultMessage(), ""), HttpStatus.OK);

spring-oxygen-flysql/src/main/java/com/isxcode/oxygen/flysql/utils/FlysqlUtils.java

@@ -62,7 +62,7 @@ public static Map<String, ColumnProperties> parseBeanProperties(Class<?> generic
 
 	/* get table name
 	 *
-	 * @param targetClass targetClass
+	 * @param targetClass tCls
 	 * @return tableName
 	 * @since 0.0.1
 	 */

spring-oxygen-flysql/src/test/java/com/isxcode/oxygen/flysql/TestSqlServer.java

@@ -85,11 +85,6 @@ public void testFlysql() {
 		List<Dog> dogQuery = flysql.build().select(Dog.class).query();
 		dogQuery.forEach(System.out::println);
 
-		//        System.out.println("=========================== show page data
-		// ====================================");
-		//        FlysqlPage<Dog> dogQueryPage = flysql.build().select(Dog.class).queryPage(1, 2);
-		//        System.out.println(dogQueryPage);
-
 		System.out.println(
 				"============================ show single data ===================================");
 		Dog dogGetOne = flysql.build().select(Dog.class).eq("name", "rose").getOne();