Chuyaoyuan/Jiscuss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Chuyaoyuan/Jiscuss:3a8b565db1b01a1d43854c3a45cd42fe141bb8f7
Branches Tags
Chuyaoyuan/Jiscuss:master Chuyaoyuan/Jiscuss:v2.0 Chuyaoyuan/Jiscuss:v2 Chuyaoyuan/Jiscuss:v1 Chuyaoyuan/Jiscuss:main
...
compare: Chuyaoyuan/Jiscuss:v1
Branches Tags
Chuyaoyuan/Jiscuss:v2.0 Chuyaoyuan/Jiscuss:master Chuyaoyuan/Jiscuss:v2 Chuyaoyuan/Jiscuss:v1 Chuyaoyuan/Jiscuss:main

5 Commits
3a8b565db1 ... v1

Author SHA1 Message Date
Chuyaoyuan 6d08799cb8 Merge pull request #1 from Chuyaoyuan/master 
v1 merge
 2023-07-31 22:24:30 +08:00
Chuyaoyuan b92918b9e8 Update RestUserController.java 
import提交
 2023-07-31 22:20:31 +08:00
Chuyaoyuan e013de4241 logout 2022-12-03 09:15:09 +08:00
Chuyaoyuan 9daa370797 修改 2022-10-17 22:47:30 +08:00
Chuyaoyuan ebd614b2e4 修改 2022-09-27 16:04:19 +08:00
4 changed files with 19 additions and 8 deletions
Expand all files Collapse all files
src/main/java/com/yaoyuan/jiscuss/common/Node.java
+8 -2
View File
@@ -54,7 +54,10 @@ public class Node {
private Date createTime; private Date createTime;
//用户表相关 /**
* avatar
* 用户表相关
**/
private String avatar; private String avatar;
private String username; private String username;
@@ -118,7 +121,10 @@ public class Node {
return firstList; return firstList;
} }
//打印 /**
* 打印
* show
**/
public static void show(List<Node> list) { public static void show(List<Node> list) {
for (Node node : list) { for (Node node : list) {
System.out.println(node.getUserId() + " 用户回复了你：" + node.getContent()); System.out.println(node.getUserId() + " 用户回复了你：" + node.getContent());
src/main/java/com/yaoyuan/jiscuss/controller/AdminSystemController.java
+5 -1
View File
@@ -22,6 +22,10 @@ public class AdminSystemController {
/** /**
* 后台退出 * 后台退出
*/ */
@RequestMapping("/admin/logout")
public String logout(@RequestParam(defaultValue = "discussion") String type, HttpServletRequest request, ModelMap map) {
return "admin/logout";
}
/** /**
* 后台设置管理 * 后台设置管理
@@ -32,7 +36,7 @@ public class AdminSystemController {
* @return * @return
*/ */
@RequestMapping("/admin/home") @RequestMapping("/admin/home")
public String user(@RequestParam(defaultValue = "discussion") String type, HttpServletRequest request, ModelMap map) { public String home(@RequestParam(defaultValue = "discussion") String type, HttpServletRequest request, ModelMap map) {
return "admin/home"; return "admin/home";
} }
} }
src/main/java/com/yaoyuan/jiscuss/controller/api/RestUserController.java
+1
View File
@@ -6,6 +6,7 @@ import com.yaoyuan.jiscuss.response.ResponseCode;
import com.yaoyuan.jiscuss.service.IUsersService; import com.yaoyuan.jiscuss.service.IUsersService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.json.JSONObject;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
src/main/resources/templates/login.ftl
+3 -3
View File
@@ -3,7 +3,6 @@
<title>Jiscuss Demo</title> <title>Jiscuss Demo</title>
<head> <head>
<#include "comm/commjs.ftl"/> <#include "comm/commjs.ftl"/>
<style type="text/css"> <style type="text/css">
body { body {
background-color: #f7f8fa; background-color: #f7f8fa;
@@ -44,7 +43,7 @@
<div class="field"> <div class="field">
<div class="ui left icon input"> <div class="ui left icon input">
<i class="lock icon"></i> <i class="lock icon"></i>
<input type="password" name="password" placeholder="密码"> <input type="password" name="password" placeholder="密 码">
</div> </div>
</div> </div>
<div class="field" id="msgId" style="display:none"> <div class="field" id="msgId" style="display:none">
@@ -52,7 +51,8 @@
${msg} ${msg}
</div> </div>
</div> </div>
<button class="ui fluid large blue button" type="submit">登录</button>
<button class="ui fluid large blue button" type="submit">登 录</button>
</div> </div>
<div class="ui error message"></div> <div class="ui error message"></div>