From d6890959dd6e8e1328b31cf3848b3a622da46a47 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Thu, 16 Apr 2020 18:09:17 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=E6=96=87?=
=?UTF-8?q?=E5=AD=97=EF=BC=8Clogo,logo=E5=9B=BE=E7=89=87=E5=A4=A7=E5=B0=8F?=
=?UTF-8?q?=EF=BC=8C=E5=BA=95=E9=83=A8=E6=96=87=E5=AD=97=E8=AF=B4=E6=98=8E?=
=?UTF-8?q?=E6=94=AF=E6=8C=81=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../manage/controller/LoginController.java | 12 +-
.../webapp/WEB-INF/views/loginDir/login.jsp | 14 ++-
.../src/main/webapp/static/css/login.css | 6 +-
.../webapp/static/img/login/logo/gaoming.png | Bin 0 -> 46872 bytes
.../webapp/static/img/login/logo/yingde.png | Bin 0 -> 27325 bytes
.../static/img/login/{ => logo}/zhanjiang.png | Bin
.../main/webapp/static/img/login/yingde.png | Bin 39832 -> 0 bytes
.../static/img/login/²¡Àú²É¼¯.png | Bin 2834 -> 0 bytes
.../template/用户列表导入模板.xls | Bin 19456 -> 19456 bytes
.../com/manage/dao/Power_Login_SetMapper.java | 17 +++
.../com/manage/entity/Power_Login_Set.java | 73 +++++++++++
.../mapper/Power_Login_SetMapper.xml | 117 ++++++++++++++++++
.../manage/service/User_Dept_MenuService.java | 2 -
.../ipml/User_Dept_MenuServiceImpl.java | 5 -
14 files changed, 228 insertions(+), 18 deletions(-)
create mode 100644 power-admin/src/main/webapp/static/img/login/logo/gaoming.png
create mode 100644 power-admin/src/main/webapp/static/img/login/logo/yingde.png
rename power-admin/src/main/webapp/static/img/login/{ => logo}/zhanjiang.png (100%)
delete mode 100644 power-admin/src/main/webapp/static/img/login/yingde.png
delete mode 100644 power-admin/src/main/webapp/static/img/login/²¡Àú²É¼¯.png
create mode 100644 power-dao/src/main/java/com/manage/dao/Power_Login_SetMapper.java
create mode 100644 power-dao/src/main/java/com/manage/entity/Power_Login_Set.java
create mode 100644 power-dao/src/main/resources/mapper/Power_Login_SetMapper.xml
diff --git a/power-admin/src/main/java/com/manage/controller/LoginController.java b/power-admin/src/main/java/com/manage/controller/LoginController.java
index dc85f37..9f32259 100644
--- a/power-admin/src/main/java/com/manage/controller/LoginController.java
+++ b/power-admin/src/main/java/com/manage/controller/LoginController.java
@@ -1,6 +1,7 @@
package com.manage.controller;
import com.alibaba.fastjson.JSON;
+import com.manage.dao.Power_Login_SetMapper;
import com.manage.encrypt.Base64;
import com.manage.encrypt.MD5;
import com.manage.entity.*;
@@ -14,6 +15,7 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -36,11 +38,15 @@ public class LoginController {
private LogService logService;
@Autowired
private Power_DeptService power_deptService;
+ @Autowired
+ private Power_Login_SetMapper powerLoginSetMapper;
@RequestMapping(value = "login",method = RequestMethod.GET)
- public String toLogin(){
+ public String toLogin(Model model){
+ Power_Login_Set loginSet = powerLoginSetMapper.selectByPrimaryKey(1);
+ model.addAttribute("loginSet",loginSet);
CacheManager.addExcCount("noExc");
- return "loginDir/login174";
+ return "loginDir/login";
}
@RequestMapping(value = "login",method = RequestMethod.POST)
@@ -143,7 +149,7 @@ public class LoginController {
e.printStackTrace();
CacheManager.addExcCount("exc");
}
- return "loginDir/login174";
+ return "loginDir/login";
}
@RequestMapping("refuse")
public String refuse(){
diff --git a/power-admin/src/main/webapp/WEB-INF/views/loginDir/login.jsp b/power-admin/src/main/webapp/WEB-INF/views/loginDir/login.jsp
index 97043bd..2c95be9 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/loginDir/login.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/loginDir/login.jsp
@@ -36,18 +36,22 @@
- 嘉时 病历无纸化归档管理系统
+
${loginSet.context}
-
+
+ 
+
diff --git a/power-admin/src/main/webapp/static/css/login.css b/power-admin/src/main/webapp/static/css/login.css
index b1610fd..fc09b85 100644
--- a/power-admin/src/main/webapp/static/css/login.css
+++ b/power-admin/src/main/webapp/static/css/login.css
@@ -88,7 +88,7 @@ h3{
*头部左侧
*/
.head_left{
- width:66%;
+ width:50%;
height:100%;
}
/**
@@ -103,8 +103,8 @@ h3{
*头部右侧
*/
.head_right{
- padding-left: 107px;
- width: 33%;
+ text-align: right;
+ width: 50%;
height: 100%;
padding-top: 28px;
}
diff --git a/power-admin/src/main/webapp/static/img/login/logo/gaoming.png b/power-admin/src/main/webapp/static/img/login/logo/gaoming.png
new file mode 100644
index 0000000000000000000000000000000000000000..62f597a96e2061b8958a7197073bac30838af726
GIT binary patch
literal 46872
zcmeFYbyQr<7Pm=4a0?b(g1fuBI|NOD1{!yFg1fuB1qkl$?he5T?(Pild!2i4=FXaL
z{+PAWYeAn~yMDW>p4wHX=;j2<$%w*1V?u*~fWV212`PYpyy1GemVyL-`F$b>WApNc
zuPde?4Fcj!3