diff --git a/backend/src/main/java/com/kob/backend/pojo/Bot.java b/backend/src/main/java/com/kob/backend/pojo/Bot.java index 11aaa18..d8564f4 100644 --- a/backend/src/main/java/com/kob/backend/pojo/Bot.java +++ b/backend/src/main/java/com/kob/backend/pojo/Bot.java @@ -19,8 +19,8 @@ public class Bot { private String description; private String content; private Integer rating; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai") private Date createtime; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai") private Date modifytime; } diff --git a/backend/src/main/java/com/kob/backend/service/impl/user/account/LoginServiceImpl.java b/backend/src/main/java/com/kob/backend/service/impl/user/account/LoginServiceImpl.java index 54106a8..4f1ce03 100644 --- a/backend/src/main/java/com/kob/backend/service/impl/user/account/LoginServiceImpl.java +++ b/backend/src/main/java/com/kob/backend/service/impl/user/account/LoginServiceImpl.java @@ -37,6 +37,7 @@ public class LoginServiceImpl implements LoginService { Map map = new HashMap<>(); map.put("error_message","success"); map.put("token",jwt); + System.out.println(jwt); return map; } } diff --git a/web/package-lock.json b/web/package-lock.json index 8947b3b..9903679 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -14,6 +14,7 @@ "jquery": "^3.6.0", "vue": "^3.2.13", "vue-router": "^4.0.3", + "vue3-ace-editor": "^2.2.2", "vuex": "^4.0.0" }, "devDependencies": { @@ -3126,6 +3127,11 @@ "node": ">= 0.6" } }, + "node_modules/ace-builds": { + "version": "1.9.5", + "resolved": "https://registry.npmmirror.com/ace-builds/-/ace-builds-1.9.5.tgz", + "integrity": "sha512-6iVEUPfqiKIGKsA63InrUhRRASmfuGnJCUBzkz/pL1BCPPEjasBp6fBA7mj4ovihICouopYYZaAKYhg6zypAwg==" + }, "node_modules/acorn": { "version": "8.8.0", "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.8.0.tgz", @@ -8847,6 +8853,11 @@ "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", "dev": true }, + "node_modules/resize-observer-polyfill": { + "version": "1.5.1", + "resolved": "https://registry.npmmirror.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz", + "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==" + }, "node_modules/resolve": { "version": "1.22.1", "resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.1.tgz", @@ -10184,6 +10195,16 @@ "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==", "dev": true }, + "node_modules/vue3-ace-editor": { + "version": "2.2.2", + "resolved": "https://registry.npmmirror.com/vue3-ace-editor/-/vue3-ace-editor-2.2.2.tgz", + "integrity": "sha512-fZ6OWosbU+odLrtrcGC/536QjCigujYJB0Hf6/tBp+ef/ohTadwQAqyBlVzOmvrmzZyubphpV9zkaZcx5Fuivw==", + "dependencies": { + "ace-builds": "^1.4.13", + "resize-observer-polyfill": "^1.5.1", + "vue": "^3.2.26" + } + }, "node_modules/vuex": { "version": "4.0.2", "resolved": "https://registry.npmmirror.com/vuex/-/vuex-4.0.2.tgz", @@ -13264,6 +13285,11 @@ "negotiator": "0.6.3" } }, + "ace-builds": { + "version": "1.9.5", + "resolved": "https://registry.npmmirror.com/ace-builds/-/ace-builds-1.9.5.tgz", + "integrity": "sha512-6iVEUPfqiKIGKsA63InrUhRRASmfuGnJCUBzkz/pL1BCPPEjasBp6fBA7mj4ovihICouopYYZaAKYhg6zypAwg==" + }, "acorn": { "version": "8.8.0", "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.8.0.tgz", @@ -17734,6 +17760,11 @@ "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", "dev": true }, + "resize-observer-polyfill": { + "version": "1.5.1", + "resolved": "https://registry.npmmirror.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz", + "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==" + }, "resolve": { "version": "1.22.1", "resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.1.tgz", @@ -18823,6 +18854,16 @@ "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==", "dev": true }, + "vue3-ace-editor": { + "version": "2.2.2", + "resolved": "https://registry.npmmirror.com/vue3-ace-editor/-/vue3-ace-editor-2.2.2.tgz", + "integrity": "sha512-fZ6OWosbU+odLrtrcGC/536QjCigujYJB0Hf6/tBp+ef/ohTadwQAqyBlVzOmvrmzZyubphpV9zkaZcx5Fuivw==", + "requires": { + "ace-builds": "^1.4.13", + "resize-observer-polyfill": "^1.5.1", + "vue": "^3.2.26" + } + }, "vuex": { "version": "4.0.2", "resolved": "https://registry.npmmirror.com/vuex/-/vuex-4.0.2.tgz", diff --git a/web/package.json b/web/package.json index 4202131..a43beef 100644 --- a/web/package.json +++ b/web/package.json @@ -14,6 +14,7 @@ "jquery": "^3.6.0", "vue": "^3.2.13", "vue-router": "^4.0.3", + "vue3-ace-editor": "^2.2.2", "vuex": "^4.0.0" }, "devDependencies": { diff --git a/web/public/favicon.ico b/web/public/favicon.ico index df36fcf..6432bdc 100644 Binary files a/web/public/favicon.ico and b/web/public/favicon.ico differ diff --git a/web/public/favicon2.ico b/web/public/favicon2.ico new file mode 100644 index 0000000..92227cf Binary files /dev/null and b/web/public/favicon2.ico differ diff --git a/web/src/App.vue b/web/src/App.vue index 411da1f..7c28790 100644 --- a/web/src/App.vue +++ b/web/src/App.vue @@ -1,13 +1,13 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +