FIX: Some DataBase Bugs fixed.

package-lock.json

@@ -0,0 +1,19 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "axios": {
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
+      "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
+      "requires": {
+        "follow-redirects": "^1.14.7"
+      }
+    },
+    "follow-redirects": {
+      "version": "1.14.7",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz",
+      "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ=="
+    }
+  }
+}

pom.xml

@@ -57,6 +57,16 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>org.forgetive.forumsystem.ForumSystemApplication</mainClass>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
         <resources>

src/main/java/META-INF/MANIFEST.MF

@@ -0,0 +1,23 @@
+Manifest-Version: 1.0
+Main-Class: org.forgetive.forumsystem.ForumSystemApplication
+Class-Path: mybatis-spring-boot-starter-2.2.1.jar spring-boot-starter-lo
+ gging-2.6.3.jar tomcat-embed-core-9.0.56.jar activation-1.1.jar jackson
+ -core-2.13.1.jar HikariCP-4.0.3.jar spring-boot-2.6.3.jar jackson-datat
+ ype-jdk8-2.13.1.jar spring-boot-starter-web-2.6.3.jar mybatis-spring-bo
+ ot-autoconfigure-2.2.1.jar jakarta.annotation-api-1.3.5.jar mybatis-3.5
+ .9.jar log4j-to-slf4j-2.17.1.jar mybatis-spring-2.0.6.jar spring-tx-5.3
+ .15.jar tomcat-embed-el-9.0.56.jar spring-context-5.3.15.jar spring-boo
+ t-starter-json-2.6.3.jar mail-1.4.3.jar spring-boot-autoconfigure-2.6.3
+ .jar spring-aop-5.3.15.jar jackson-datatype-jsr310-2.13.1.jar jackson-a
+ nnotations-2.13.1.jar spring-web-5.3.15.jar logback-core-1.2.10.jar log
+ 4j-api-2.17.1.jar slf4j-api-1.7.33.jar tomcat-embed-websocket-9.0.56.ja
+ r spring-jcl-5.3.15.jar spring-boot-starter-tomcat-2.6.3.jar spring-web
+ mvc-5.3.15.jar spring-jdbc-5.3.15.jar mysql-connector-java-8.0.28.jar s
+ pring-core-5.3.15.jar javax.transaction.jar javax.persistence.jar javax
+ .ejb.jar javax.servlet.jsp.jstl.jar javax.jms.jar javax.resource.jar ja
+ vax.servlet.jsp.jar jackson-databind-2.13.1.jar lombok-1.18.22.jar spri
+ ng-expression-5.3.15.jar spring-beans-5.3.15.jar jul-to-slf4j-1.7.33.ja
+ r snakeyaml-1.29.jar jackson-module-parameter-names-2.13.1.jar spring-b
+ oot-starter-jdbc-2.6.3.jar logback-classic-1.2.10.jar spring-boot-start
+ er-2.6.3.jar
+

src/main/java/org/forgetive/forumsystem/controller/PassageController.java

@@ -1,7 +1,6 @@
 package org.forgetive.forumsystem.controller;
 
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import lombok.*;
 import org.forgetive.forumsystem.bean.*;
 import org.forgetive.forumsystem.dao.passage.PassageMapper;
 import org.forgetive.forumsystem.pojo.auth.UserSecure;
@@ -14,6 +13,7 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/psg")
+@CrossOrigin
 public class PassageController {
 
     @RequestMapping("/list")

src/main/java/org/forgetive/forumsystem/controller/UserAuthController.java

@@ -16,6 +16,7 @@ import java.util.UUID;
 
 @RestController
 @RequestMapping("/auth")
+@CrossOrigin
 public class UserAuthController {
 
     public static final int MAX_USER_LOGIN_CNT = 3;
@@ -31,7 +32,7 @@ public class UserAuthController {
         return new StatusCodeResponse(201);
     }
 
-    @RequestMapping("checkEmail")
+    @RequestMapping("/checkEmail")
     public @ResponseBody StatusCodeResponse checkEmailSecret(@RequestBody CheckEmailSecretRequest request) {
         if (!ValidInputUtils.isValidEmail(request.getEmail())) return new StatusCodeResponse(604);
         if (EmailCheckModule.checkSecretEmail(request.getEmail(), request.getSecret()))
@@ -39,7 +40,7 @@ public class UserAuthController {
         return new StatusCodeResponse(604);
     }
 
-    @RequestMapping("login")
+    @RequestMapping("/login")
     public @ResponseBody LoginResponse login(@RequestBody LoginRequest request) {
         if (!ValidInputUtils.isValidEmail(request.getEmail())) return new LoginResponse(605, "");
         UserSecure userSecure = SQLUtils.executeMapper(UserSecureMapper.class, mapper -> mapper.selectByEmail(request.getEmail()));

src/main/java/org/forgetive/forumsystem/dao/passage/PassageMapper.xml

@@ -9,10 +9,12 @@
                passage.passage_content as passage_content,
                passage.passage_time as passage_time,
                passage_good_cnt.passage_good_cnt as passage_good_cnt,
-               passage_watch_cnt.passage_watch_cnt as passage_watch_cnt
+               passage_watch_cnt.passage_watch_cnt as passage_watch_cnt,
+               user_secure.user_name as user_name
         from passage
             left join passage_good_cnt on passage.passage_id = passage_good_cnt.passage_id
             left join passage_watch_cnt on passage.passage_id = passage_watch_cnt.passage_id
+            left join user_secure on passage.user_id = user_secure.user_id
         where user_id = #{userId}
     </select>
     <select id="selectRecommendPassage" resultType="org.forgetive.forumsystem.pojo.passage.Passage">
@@ -22,10 +24,12 @@
                passage.passage_time as passage_time,
                passage_good_cnt.passage_good_cnt as passage_good_cnt,
                passage_watch_cnt.passage_watch_cnt as passage_watch_cnt,
-            (passage_good_cnt.passage_good_cnt * 17280 - 5 * timestampdiff(second, passage.passage_time, current_timestamp())) as passage_recommend
+               (passage_good_cnt.passage_good_cnt * 17280 - 5 * timestampdiff(second, passage.passage_time, current_timestamp())) as passage_recommend,
+               user_secure.user_name as user_name
         from passage
             left join passage_good_cnt on passage.passage_id = passage_good_cnt.passage_id
             left join passage_watch_cnt on passage.passage_id = passage_watch_cnt.passage_id
+            left join user_secure on passage.user_id = user_secure.user_id
         order by passage_recommend desc limit #{offset}, #{count}
     </select>
     <select id="selectNewestPassage" resultType="org.forgetive.forumsystem.pojo.passage.Passage">
@@ -35,10 +39,12 @@
                passage.passage_time as passage_time,
                passage_good_cnt.passage_good_cnt as passage_good_cnt,
                passage_watch_cnt.passage_watch_cnt as passage_watch_cnt,
-               (passage_good_cnt.passage_good_cnt * 17280 - timestampdiff(second, passage.passage_time, current_timestamp())) as passage_recommend
+               (passage_good_cnt.passage_good_cnt * 17280 - timestampdiff(second, passage.passage_time, current_timestamp())) as passage_recommend,
+               user_secure.user_name as user_name
         from passage
                  left join passage_good_cnt on passage.passage_id = passage_good_cnt.passage_id
                  left join passage_watch_cnt on passage.passage_id = passage_watch_cnt.passage_id
+                 left join user_secure on passage.user_id = user_secure.user_id
         order by passage_recommend desc limit #{offset}, #{count}
     </select>
     <select id="selectHighQualityPassage" resultType="org.forgetive.forumsystem.pojo.passage.Passage">
@@ -48,10 +54,12 @@
                passage.passage_time as passage_time,
                passage_good_cnt.passage_good_cnt as passage_good_cnt,
                passage_watch_cnt.passage_watch_cnt as passage_watch_cnt,
-               (passage_good_cnt.passage_good_cnt * 17280 - 10 * timestampdiff(second, passage.passage_time, current_timestamp())) as passage_recommend
+               (passage_good_cnt.passage_good_cnt * 17280 - 10 * timestampdiff(second, passage.passage_time, current_timestamp())) as passage_recommend,
+               user_secure.user_name as user_name
         from passage
                  left join passage_good_cnt on passage.passage_id = passage_good_cnt.passage_id
                  left join passage_watch_cnt on passage.passage_id = passage_watch_cnt.passage_id
+                 left join user_secure on passage.user_id = user_secure.user_id
         order by passage_recommend desc limit #{offset}, #{count}
     </select>
     <insert id="insert">
@@ -89,10 +97,12 @@
                passage.passage_content as passage_content,
                passage.passage_time as passage_time,
                passage_good_cnt.passage_good_cnt as passage_good_cnt,
-               passage_watch_cnt.passage_watch_cnt as passage_watch_cnt
+               passage_watch_cnt.passage_watch_cnt as passage_watch_cnt,
+               user_secure.user_name as user_name
         from passage
                  left join passage_good_cnt on passage.passage_id = passage_good_cnt.passage_id
                  left join passage_watch_cnt on passage.passage_id = passage_watch_cnt.passage_id
+                 left join user_secure on passage.user_id = user_secure.user_id
         where passage.passage_id = #{passageId}
     </select>
 </mapper>

src/main/java/org/forgetive/forumsystem/pojo/passage/Passage.java

@@ -16,4 +16,5 @@ public class Passage implements PassageGoodCnt, PassageWatchCnt {
     @Getter private int passage_good_cnt;
     @Getter private long passage_watch_cnt;
     @Getter private long passage_recommend;
+    @Getter private String user_name;
 }

src/main/resources/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: org.forgetive.forumsystem.ForumSystemApplication
+

src/main/resources/mybatis-config.xml

@@ -10,7 +10,7 @@
                 <property name="driver" value="com.mysql.cj.jdbc.Driver"/>
                 <property name="url" value="jdbc:mysql://localhost:3306/forumsystemdb?useUnicode=true&amp;characterEncoding=utf8&amp;serverTimezone=GMT%2B8&amp;useSSL=false&amp;allowMultiQueries=true"/>
                 <property name="username" value="root"/>
-                <property name="password" value="Xc20010525"/>
+                <property name="password" value="BJHbksMxf2CZRMGE"/>
             </dataSource>
         </environment>
     </environments>

src/test/java/org/forgetive/forumsystem/controller/auth.checkEmail.http

@@ -1,8 +1,8 @@
 POST /auth/checkEmail HTTP/1.1
-Host: localhost:8080
+Host: forgetive.org:15632
 Content-Type: application/json
 
 {
   "email": "1453857082@qq.com",
-  "secret": "260376"
+  "secret": "840257"
 }

src/test/java/org/forgetive/forumsystem/controller/auth.login.http

@@ -1,5 +1,5 @@
 POST /auth/login HTTP/1.1
-Host: localhost:8080
+Host: forgetive.org:15632
 Content-Type: application/json
 
 {

src/test/java/org/forgetive/forumsystem/controller/auth.reg.http

@@ -1,5 +1,5 @@
 POST /auth/reg HTTP/1.1
-Host: localhost:8080
+Host: forgetive.org:15632
 Content-Type: application/json
 
 {

src/test/java/org/forgetive/forumsystem/controller/psg.getWatchCnt.http

@@ -1,7 +1,7 @@
 POST /psg/getWatchCnt HTTP/1.1
-Host: localhost:8080
+Host: forgetive.org:15632
 Content-Type: application/json
 
 {
-  "passageId": 1
+  "passageId": 8
 }

src/test/java/org/forgetive/forumsystem/controller/psg.list.http

@@ -1,5 +1,5 @@
 POST /psg/list HTTP/1.1
-Host: localhost:8080
+Host: forgetive.org:15632
 Content-Type: application/json
 
 {

src/test/java/org/forgetive/forumsystem/controller/psg.pub.http

@@ -1,8 +1,8 @@
 POST /psg/pub HTTP/1.1
-Host: localhost:8080
+Host: forgetive.org:15632
 Content-Type: application/json
 
 {
-  "session": "a125d1bee4754841a462048eb3410b6f",
-  "content": "Hello world 2"
+  "session": "da88f1f44b8f42cca020a2d6f20add3b",
+  "content": "测试的第25个卡片"
 }

src/test/java/org/forgetive/forumsystem/controller/psg.setGood.http

@@ -1,9 +1,9 @@
 POST /psg/setGood HTTP/1.1
-Host: localhost:8080
+Host: forgetive.org:15632
 Content-Type: application/json
 
 {
-  "session": "a125d1bee4754841a462048eb3410b6f",
-  "passageId": 3,
+  "session": "da88f1f44b8f42cca020a2d6f20add3b",
+  "passageId": 8,
   "isGood": 1
 }

src/test/java/org/forgetive/forumsystem/controller/psg.setWatch.http

@@ -1,8 +1,8 @@
 POST /psg/setWatch HTTP/1.1
-Host: localhost:8080
+Host: forgetive.org:15632
 Content-Type: application/json
 
 {
-  "session": "a125d1bee4754841a462048eb3410b6f",
-  "passageId": 1
+  "session": "da88f1f44b8f42cca020a2d6f20add3b",
+  "passageId": 8
 }

src/test/java/org/forgetive/forumsystem/dao/UserSecureMapperTest.java

@@ -10,41 +10,41 @@ import java.util.Date;
 
 public class UserSecureMapperTest {
 
-    @Test
-    public void selectTest() {
-        SqlSession sqlSession = SQLUtils.getSqlSession();
-        UserSecureMapper mapper = sqlSession.getMapper(UserSecureMapper.class);
-        System.out.println(mapper.selectByEmail("1@s"));
-        sqlSession.close();
-    }
-
-    @Test
-    public void insertTest() {
-        SqlSession sqlSession = SQLUtils.getSqlSession();
-        UserSecureMapper mapper = sqlSession.getMapper(UserSecureMapper.class);
-        System.out.println(mapper.insertNew("ss", "sdasd", "2334939idf@!dsdsa/d"));
-        sqlSession.commit();
-        sqlSession.close();
-    }
-
-    @Test
-    public void updateTest() {
-        SqlSession sqlSession = SQLUtils.getSqlSession();
-        UserSecureMapper mapper = sqlSession.getMapper(UserSecureMapper.class);
-        UserSecure user28 = mapper.selectById(28);
-        user28.setUser_name("User28newname");
-        System.out.println(mapper.update(user28));
-        sqlSession.commit();
-        sqlSession.close();
-    }
-
-    @Test
-    public void deleteTest() {
-        SqlSession sqlSession = SQLUtils.getSqlSession();
-        UserSecureMapper mapper = sqlSession.getMapper(UserSecureMapper.class);
-        System.out.println(mapper.delete(27));
-        sqlSession.commit();
-        sqlSession.close();
-    }
+//    @Test
+//    public void selectTest() {
+//        SqlSession sqlSession = SQLUtils.getSqlSession();
+//        UserSecureMapper mapper = sqlSession.getMapper(UserSecureMapper.class);
+//        System.out.println(mapper.selectByEmail("1@s"));
+//        sqlSession.close();
+//    }
+//
+//    @Test
+//    public void insertTest() {
+//        SqlSession sqlSession = SQLUtils.getSqlSession();
+//        UserSecureMapper mapper = sqlSession.getMapper(UserSecureMapper.class);
+//        System.out.println(mapper.insertNew("ss", "sdasd", "2334939idf@!dsdsa/d"));
+//        sqlSession.commit();
+//        sqlSession.close();
+//    }
+//
+//    @Test
+//    public void updateTest() {
+//        SqlSession sqlSession = SQLUtils.getSqlSession();
+//        UserSecureMapper mapper = sqlSession.getMapper(UserSecureMapper.class);
+//        UserSecure user28 = mapper.selectById(28);
+//        user28.setUser_name("User28newname");
+//        System.out.println(mapper.update(user28));
+//        sqlSession.commit();
+//        sqlSession.close();
+//    }
+//
+//    @Test
+//    public void deleteTest() {
+//        SqlSession sqlSession = SQLUtils.getSqlSession();
+//        UserSecureMapper mapper = sqlSession.getMapper(UserSecureMapper.class);
+//        System.out.println(mapper.delete(27));
+//        sqlSession.commit();
+//        sqlSession.close();
+//    }
 
 }