From f43dbb953a501646685a537728f93221f622ee11 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 27 十二月 2023 08:37:01 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/ConfigService.java | 2 +
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ConfigServiceImpl.java | 5 ++
zy-asrs-common/src/main/java/com/zy/asrs/common/web/AuthController.java | 16 ++++++++
zy-asrs-wms/src/main/webapp/static/js/common.js | 3 +
zy-asrs-common/src/main/resources/mapper/sys/ConfigMapper.xml | 10 +++++
zy-asrs-wms/src/main/webapp/views/login.html | 52 +++++++++++++-------------
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/ConfigMapper.java | 2 +
7 files changed, 64 insertions(+), 26 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/ConfigMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/ConfigMapper.java
index de58579..d84aa53 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/ConfigMapper.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/ConfigMapper.java
@@ -9,4 +9,6 @@
@Repository
public interface ConfigMapper extends BaseMapper<Config> {
+ Config selectByCode(String code);
+
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/ConfigService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/ConfigService.java
index efe0acf..6ee2784 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/ConfigService.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/ConfigService.java
@@ -6,4 +6,6 @@
public interface ConfigService extends IService<Config> {
+ Config selectByCode(String code);
+
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ConfigServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ConfigServiceImpl.java
index 3dccb5c..c085263 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ConfigServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ConfigServiceImpl.java
@@ -9,4 +9,9 @@
@Service("configService")
public class ConfigServiceImpl extends ServiceImpl<ConfigMapper, Config> implements ConfigService {
+ @Override
+ public Config selectByCode(String code) {
+ return this.baseMapper.selectByCode(code);
+ }
+
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/web/AuthController.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/web/AuthController.java
index 0ec42a1..80c67e9 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/web/AuthController.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/web/AuthController.java
@@ -46,6 +46,8 @@
private RoleResourceService roleResourceService;
@Autowired
private HostService hostService;
+ @Autowired
+ private ConfigService configService;
@RequestMapping("/login.action")
@ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐧诲綍")
@@ -358,6 +360,20 @@
}
}
+ @RequestMapping("/loginInformation")
+ public R getLoginPageInformation() {
+ Config loginLogo = configService.selectByCode("loginLogo");
+ Config loginCopyrightText = configService.selectByCode("loginCopyrightText");
+ Config loginCopyrightImg1 = configService.selectByCode("loginCopyrightImg1");
+
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("loginLogo", loginLogo.getValue());
+ map.put("loginCopyrightText", loginCopyrightText.getValue());
+ map.put("loginCopyrightImg1", loginCopyrightImg1.getStatus() == 1 ? loginCopyrightImg1.getValue() : "");
+
+ return R.ok().add(map);
+ }
+
@PostMapping(value = "/system/secret/auth")
@ManagerAuth
public R systemSecret(@RequestParam(value = "secret") String secret) {
diff --git a/zy-asrs-common/src/main/resources/mapper/sys/ConfigMapper.xml b/zy-asrs-common/src/main/resources/mapper/sys/ConfigMapper.xml
new file mode 100644
index 0000000..1bdb75c
--- /dev/null
+++ b/zy-asrs-common/src/main/resources/mapper/sys/ConfigMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.common.sys.mapper.ConfigMapper">
+
+ <select id="selectByCode" resultType="com.zy.asrs.common.sys.entity.Config">
+ select top 1 * from sys_config
+ where code = #{code}
+ </select>
+
+</mapper>
diff --git a/zy-asrs-wms/src/main/webapp/static/js/common.js b/zy-asrs-wms/src/main/webapp/static/js/common.js
index 8edd976..04219cb 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/common.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/common.js
@@ -78,6 +78,9 @@
var param = (child?parent.window:window).location.href.split("?")[1];
if (null != param) {
var resourceId = getQueryVariable('resourceId')
+ if (resourceId == false) {
+ resourceId = param.split("=")[1];
+ }
$.ajax({
url: baseUrl+"/power/menu/"+resourceId+"/auth",
headers: {'token': localStorage.getItem('token')},
diff --git a/zy-asrs-wms/src/main/webapp/views/login.html b/zy-asrs-wms/src/main/webapp/views/login.html
index 9b40a78..aed32f4 100644
--- a/zy-asrs-wms/src/main/webapp/views/login.html
+++ b/zy-asrs-wms/src/main/webapp/views/login.html
@@ -236,32 +236,32 @@
<script type="text/javascript" src="../static/js/common.js"></script>
<script>
// 鑾峰彇淇℃伅
- // $(function () {
- // $.ajax({
- // url: baseUrl+"/loginInformation",
- // data: {},
- // method: 'GET',
- // success: function (res) {
- // var data = res.data
- // $(".copyright-text").text(data.loginCopyrightText);
- // $(".copyright-img-url").attr("src", data.loginCopyrightImg1);
- // $(".loginLogoUrl").attr("src", data.loginLogo);
- //
- // if (data.loginCopyrightImg1 == "") {
- // $(".copyright-img-url").hide()
- // }
- // }
- // });
- //
- // var oldUserName = localStorage.getItem('oldUserName');
- // var oldPass = localStorage.getItem('oldPass');
- // if(oldUserName){
- // $('#username').val(oldUserName);
- // }
- // if(oldPass){
- // $('#password').val(oldPass);
- // }
- // })
+ $(function () {
+ $.ajax({
+ url: baseUrl+"/loginInformation",
+ data: {},
+ method: 'GET',
+ success: function (res) {
+ var data = res.data
+ $(".copyright-text").text(data.loginCopyrightText);
+ $(".copyright-img-url").attr("src", data.loginCopyrightImg1);
+ $(".loginLogoUrl").attr("src", data.loginLogo);
+
+ if (data.loginCopyrightImg1 == "") {
+ $(".copyright-img-url").hide()
+ }
+ }
+ });
+
+ var oldUserName = localStorage.getItem('oldUserName');
+ var oldPass = localStorage.getItem('oldPass');
+ if(oldUserName){
+ $('#username').val(oldUserName);
+ }
+ if(oldPass){
+ $('#password').val(oldPass);
+ }
+ })
window.onload = function(){document.getElementById("username").focus();}
--
Gitblit v1.9.1