Update dependencies and fix deployment

wuweiran · Jan 31, 2024 · 962081e · 962081e
1 parent 7269848
commit 962081e
Show file tree

Hide file tree

Showing 20 changed files with 537 additions and 501 deletions.
diff --git a/tortolla-web/index.html b/tortolla-web/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" href="/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Tortolla Blog System</title>
+    <title>Tortolla Blog</title>
   </head>
   <body>
     <div id="root"></div>

diff --git a/tortolla-web/package-lock.json b/tortolla-web/package-lock.json
diff --git a/tortolla-web/package.json b/tortolla-web/package.json
@@ -10,28 +10,28 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@fluentui/react-components": "^9.45.0",
+    "@fluentui/react-components": "^9.46.2",
     "markdown-it": "^14.0.0",
     "monaco-editor": "^0.45.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-i18next": "^14.0.0",
+    "react-i18next": "^14.0.1",
     "react-router-dom": "^6.21.3"
   },
   "devDependencies": {
     "@types/markdown-it": "^13.0.7",
     "@types/react": "^18.2.48",
     "@types/react-dom": "^18.2.18",
-    "@typescript-eslint/eslint-plugin": "^6.19.0",
-    "@typescript-eslint/parser": "^6.19.0",
+    "@typescript-eslint/eslint-plugin": "^6.20.0",
+    "@typescript-eslint/parser": "^6.20.0",
     "@vitejs/plugin-react": "^4.2.1",
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.5",
-    "prettier-eslint": "^16.2.0",
+    "prettier-eslint": "^16.3.0",
     "typescript": "^5.3.3",
-    "vite": "^5.0.11"
+    "vite": "^5.0.12"
   }
 }
diff --git a/...a/clan/midnight/tortolla/UserService.java → ...idnight/tortolla/service/UserService.java b/...a/clan/midnight/tortolla/UserService.java → ...idnight/tortolla/service/UserService.java
@@ -1,5 +1,7 @@
-package clan.midnight.tortolla;
+package clan.midnight.tortolla.service;
 
+import clan.midnight.tortolla.User;
+import clan.midnight.tortolla.repository.UserRepository;
 import clan.midnight.tortolla.util.JwtUtil;
 import clan.midnight.tortolla.util.PasswordEncoder;
 import jakarta.annotation.Resource;

diff --git a/tortolla/domain/src/main/java/clan/midnight/tortolla/Post.java b/tortolla/domain/src/main/java/clan/midnight/tortolla/Post.java
@@ -1,5 +1,7 @@
 package clan.midnight.tortolla;
 
+import clan.midnight.tortolla.repository.UserRepository;
+
 import java.util.Date;
 
 @SuppressWarnings("LombokGetterMayBeUsed")

diff --git a/...lan/midnight/tortolla/PostRepository.java → ...t/tortolla/repository/PostRepository.java b/...lan/midnight/tortolla/PostRepository.java → ...t/tortolla/repository/PostRepository.java
@@ -1,4 +1,6 @@
-package clan.midnight.tortolla;
+package clan.midnight.tortolla.repository;
+
+import clan.midnight.tortolla.Post;
 
 import java.util.List;
 

diff --git a/...lan/midnight/tortolla/UserRepository.java → ...t/tortolla/repository/UserRepository.java b/...lan/midnight/tortolla/UserRepository.java → ...t/tortolla/repository/UserRepository.java
@@ -1,4 +1,4 @@
-package clan.midnight.tortolla;
+package clan.midnight.tortolla.repository;
 
 
 import clan.midnight.tortolla.User;

diff --git a/...n/java/clan/midnight/tortolla/PostPO.java → ...lan/midnight/tortolla/persist/PostPO.java b/...n/java/clan/midnight/tortolla/PostPO.java → ...lan/midnight/tortolla/persist/PostPO.java
@@ -1,4 +1,4 @@
-package clan.midnight.tortolla;
+package clan.midnight.tortolla.persist;
 
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;

diff --git a/...n/java/clan/midnight/tortolla/UserPO.java → ...lan/midnight/tortolla/persist/UserPO.java b/...n/java/clan/midnight/tortolla/UserPO.java → ...lan/midnight/tortolla/persist/UserPO.java
@@ -1,4 +1,4 @@
-package clan.midnight.tortolla;
+package clan.midnight.tortolla.persist;
 
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;

diff --git a/.../midnight/tortolla/JpaPostRepository.java → ...ortolla/repository/JpaPostRepository.java b/.../midnight/tortolla/JpaPostRepository.java → ...ortolla/repository/JpaPostRepository.java
@@ -1,5 +1,7 @@
-package clan.midnight.tortolla;
+package clan.midnight.tortolla.repository;
 
+import clan.midnight.tortolla.Post;
+import clan.midnight.tortolla.persist.PostPO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;

diff --git a/.../midnight/tortolla/JpaUserRepository.java → ...ortolla/repository/JpaUserRepository.java b/.../midnight/tortolla/JpaUserRepository.java → ...ortolla/repository/JpaUserRepository.java
@@ -1,5 +1,7 @@
-package clan.midnight.tortolla;
+package clan.midnight.tortolla.repository;
 
+import clan.midnight.tortolla.User;
+import clan.midnight.tortolla.persist.UserPO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

diff --git a/.../midnight/tortolla/PostJpaRepository.java → ...ortolla/repository/PostJpaRepository.java b/.../midnight/tortolla/PostJpaRepository.java → ...ortolla/repository/PostJpaRepository.java
@@ -1,5 +1,6 @@
-package clan.midnight.tortolla;
+package clan.midnight.tortolla.repository;
 
+import clan.midnight.tortolla.persist.PostPO;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.repository.PagingAndSortingRepository;
 

diff --git a/.../midnight/tortolla/UserJpaRepository.java → ...ortolla/repository/UserJpaRepository.java b/.../midnight/tortolla/UserJpaRepository.java → ...ortolla/repository/UserJpaRepository.java
@@ -1,5 +1,6 @@
-package clan.midnight.tortolla;
+package clan.midnight.tortolla.repository;
 
+import clan.midnight.tortolla.persist.UserPO;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface UserJpaRepository extends JpaRepository<UserPO, Long> {

diff --git a/tortolla/pom.xml b/tortolla/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.2.0</version>
+        <version>3.2.2</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>clan.midnight</groupId>
@@ -61,7 +61,7 @@
             <dependency>
                 <groupId>com.azure.spring</groupId>
                 <artifactId>spring-cloud-azure-dependencies</artifactId>
-                <version>5.7.0</version>
+                <version>5.8.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/tortolla/presentation/.azure/.gitignore b/tortolla/presentation/.azure/.gitignore
@@ -0,0 +1,3 @@
+.env
+connections.resources.xml
+deployment.targets.xml
diff --git a/tortolla/presentation/.azure/default/connections.xml b/tortolla/presentation/.azure/default/connections.xml
@@ -0,0 +1 @@
+<connections />
diff --git a/tortolla/presentation/.azure/profiles.xml b/tortolla/presentation/.azure/profiles.xml
@@ -0,0 +1,3 @@
+<profiles version="1" defaultProfile="default">
+  <profile name="default" />
+</profiles>
diff --git a/tortolla/presentation/src/main/java/clan/midnight/tortolla/TortollaApplication.java b/tortolla/presentation/src/main/java/clan/midnight/tortolla/TortollaApplication.java
@@ -5,7 +5,7 @@
 import org.springframework.context.annotation.ComponentScan;
 
 @SpringBootApplication
-@ComponentScan(basePackages = {"clan.midnight.tortolla.controller"})
+@ComponentScan(basePackages = {"clan.midnight.tortolla.controller", "clan.midnight.tortolla.repository", "clan.midnight.tortolla.service"})
 public class TortollaApplication {
 
     public static void main(String[] args) {

diff --git a/tortolla/presentation/src/main/java/clan/midnight/tortolla/controller/PostController.java b/tortolla/presentation/src/main/java/clan/midnight/tortolla/controller/PostController.java
@@ -1,9 +1,13 @@
 package clan.midnight.tortolla.controller;
 
-import clan.midnight.tortolla.*;
+import clan.midnight.tortolla.Post;
+import clan.midnight.tortolla.User;
+import clan.midnight.tortolla.repository.PostRepository;
+import clan.midnight.tortolla.repository.UserRepository;
 import clan.midnight.tortolla.request.CreatePostRequest;
 import clan.midnight.tortolla.request.DeletePostRequest;
 import clan.midnight.tortolla.response.*;
+import clan.midnight.tortolla.service.UserService;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/tortolla/presentation/src/main/java/clan/midnight/tortolla/controller/UserController.java b/tortolla/presentation/src/main/java/clan/midnight/tortolla/controller/UserController.java
@@ -1,11 +1,11 @@
 package clan.midnight.tortolla.controller;
 
 import clan.midnight.tortolla.User;
-import clan.midnight.tortolla.UserRepository;
-import clan.midnight.tortolla.UserService;
+import clan.midnight.tortolla.repository.UserRepository;
 import clan.midnight.tortolla.request.SignInRequest;
 import clan.midnight.tortolla.request.SignUpRequest;
 import clan.midnight.tortolla.response.*;
+import clan.midnight.tortolla.service.UserService;
 import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;