#
Junjie
2023-12-27 f43dbb953a501646685a537728f93221f622ee11
#
1个文件已添加
6个文件已修改
90 ■■■■ 已修改文件
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/mapper/ConfigMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/ConfigService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ConfigServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/java/com/zy/asrs/common/web/AuthController.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-common/src/main/resources/mapper/sys/ConfigMapper.xml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/webapp/static/js/common.js 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/webapp/views/login.html 52 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
}
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);
}
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);
    }
}
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) {
zy-asrs-common/src/main/resources/mapper/sys/ConfigMapper.xml
New file
@@ -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>
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')},
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();}