diff --git a/src/main/java/com/webank/webase/front/util/JsonUtils.java b/src/main/java/com/webank/webase/front/util/JsonUtils.java
index 0e80f529e..e1a8fa252 100644
--- a/src/main/java/com/webank/webase/front/util/JsonUtils.java
+++ b/src/main/java/com/webank/webase/front/util/JsonUtils.java
@@ -9,8 +9,21 @@
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
+import com.fasterxml.jackson.module.paramnames.ParameterNamesModule;
import java.io.IOException;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -26,6 +39,8 @@
@Slf4j
public class JsonUtils {
private static final String STANDARD_FORMAT = "yyyy-MM-dd HH:mm:ss";
+ public static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
+ public static final String DEFAULT_TIME_FORMAT = "HH:mm:ss";
/**
* 设置一些通用的属性
*/
@@ -45,6 +60,22 @@ public class JsonUtils {
objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
// date format
objectMapper.setDateFormat(new SimpleDateFormat(STANDARD_FORMAT));
+ // LocalDate format
+ JavaTimeModule javaTimeModule = new JavaTimeModule();
+ javaTimeModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(
+ DateTimeFormatter.ofPattern(STANDARD_FORMAT)));
+ javaTimeModule.addSerializer(LocalDate.class,
+ new LocalDateSerializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+ javaTimeModule.addSerializer(LocalTime.class,
+ new LocalTimeSerializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+ javaTimeModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(
+ DateTimeFormatter.ofPattern(STANDARD_FORMAT)));
+ javaTimeModule.addDeserializer(LocalDate.class,
+ new LocalDateDeserializer(DateTimeFormatter.ofPattern(DEFAULT_DATE_FORMAT)));
+ javaTimeModule.addDeserializer(LocalTime.class,
+ new LocalTimeDeserializer(DateTimeFormatter.ofPattern(DEFAULT_TIME_FORMAT)));
+ objectMapper.registerModule(javaTimeModule).registerModule(new ParameterNamesModule())
+ .registerModule(new Jdk8Module());
return objectMapper;
});
diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html
index 663d35c29..37fe6456d 100644
--- a/src/main/resources/static/index.html
+++ b/src/main/resources/static/index.html
@@ -15,7 +15,7 @@
vertical-align: -0.15em;
fill: currentColor;
overflow: hidden;
- }
diff --git a/web/src/components/sendTransaction.vue b/web/src/components/sendTransaction.vue
index 1bc82dd26..47cf61f4e 100644
--- a/web/src/components/sendTransaction.vue
+++ b/web/src/components/sendTransaction.vue
@@ -652,7 +652,7 @@ export default {
this.creatUserNameVisible = false;
},
checkFunction(item) {
- return (item.stateMutability==='view'||item.stateMutability==='cosntant'||item.stateMutability==='pure') ? false : true;
+ return (item.stateMutability==='view'||item.stateMutability==='constant'||item.stateMutability==='pure') ? false : true;
},
},
};
diff --git a/web/src/views/chaincode/components/code.vue b/web/src/views/chaincode/components/code.vue
index a7f593070..81c0bcdc4 100644
--- a/web/src/views/chaincode/components/code.vue
+++ b/web/src/views/chaincode/components/code.vue
@@ -392,6 +392,8 @@ export default {
created() {},
beforeMount() {},
mounted: function () {
+ console.log(this.$chooseLang(201014))
+
this.initEditor();
Bus.$on("select", (data) => {
this.codeShow = true;
@@ -1084,6 +1086,7 @@ export default {
message: this.$chooseLang(res.data.code),
type: "error",
});
+ console.log(this.$chooseLang(res.data.code))
if (res.data.code === 201151||res.data.code === 201014) {
setTimeout(() => {
this.$notify({