diff --git a/blxc-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/blxc-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index 27e5f8c..ee551f1 100644 --- a/blxc-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/blxc-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -143,6 +143,20 @@ public class SysLoginController extends BaseController } + @GetMapping("/portal/downLoad") + public String downLoad(HttpServletRequest request, HttpServletResponse response, ModelMap mmap) + { + + mmap.put("newType", "48"); + //友情链接 + NdNew ndNew = new NdNew(); + ndNew.setNewType("13"); + List yqljList = ndNewService.selectNdNewList(ndNew); + mmap.put("yqljList", yqljList); + return "portal/downList"; + } + + @PostMapping("/portal/dataList") @ResponseBody public TableDataInfo dataList(NdNew ndNew) diff --git a/blxc-admin/src/main/resources/application.yml b/blxc-admin/src/main/resources/application.yml index 21f5c21..8f5063d 100644 --- a/blxc-admin/src/main/resources/application.yml +++ b/blxc-admin/src/main/resources/application.yml @@ -7,9 +7,9 @@ ruoyi: # 版权年份 copyrightYear: 2024 # 实例演示开关 - demoEnabled: true + demoEnabled: false # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: D:/ruoyi/uploadPath + profile: C:/ruoyi/uploadPath # 获取ip地址开关 addressEnabled: false diff --git a/blxc-admin/src/main/resources/static/css/login.css b/blxc-admin/src/main/resources/static/css/login.css index 3ec0cf3..8f0fe04 100644 --- a/blxc-admin/src/main/resources/static/css/login.css +++ b/blxc-admin/src/main/resources/static/css/login.css @@ -10,7 +10,7 @@ body.signin { background-size:cover } .signinpanel { - width:900px; +/* width:1000px;*/ margin:10% auto 0; color:rgba(255,255,255,.95) } diff --git a/blxc-admin/src/main/resources/static/css/login.min.css b/blxc-admin/src/main/resources/static/css/login.min.css index 0e4cc9c..c95702b 100644 --- a/blxc-admin/src/main/resources/static/css/login.min.css +++ b/blxc-admin/src/main/resources/static/css/login.min.css @@ -1 +1 @@ -html{height:100%}body.signin{height:auto;background:url(../img/login-background.png) no-repeat center fixed;-webkit-background-size:cover;-moz-background-size:cover;-o-background-size:cover;background-size:cover}.signinpanel{width:900px;margin:10% auto 0;color:rgba(255,255,255,.95)}.signinpanel .logopanel{float:none;width:auto;padding:0;background:0}.signinpanel .signin-info ul{list-style:none;padding:0;margin:20px 0}.signinpanel .form-control{display:block;margin-top:15px}.signinpanel .uname{background:#fff url(../img/user.png) no-repeat 95% center;color:#333}.signinpanel .pword{background:#fff url(../img/locked.png) no-repeat 95% center;color:#333}.signinpanel .code{background:#fff no-repeat 95% center;color:#333;margin:0 0 15px 0}.signinpanel .btn{margin-top:15px}.signinpanel form{background:rgba(255,255,255,.2);border:1px solid rgba(255,255,255,.3);-moz-box-shadow:0 3px 0 rgba(12,12,12,.03);-webkit-box-shadow:0 3px 0 rgba(12,12,12,.03);box-shadow:0 3px 0 rgba(12,12,12,.03);-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;padding:30px}.signup-footer{border-top:solid 1px rgba(255,255,255,.3);margin:20px 0;padding-top:15px}@media screen and (max-width:768px){.signinpanel,.signuppanel{margin:0 auto;width:380px!important;padding:20px}.signinpanel form{margin-top:20px}.signup-footer,.signuppanel .form-control{margin-bottom:10px}.signup-footer .pull-left,.signup-footer .pull-right{float:none!important;text-align:center}.signinpanel .signin-info ul{display:none}}@media screen and (max-width:320px){.signinpanel,.signuppanel{margin:0 20px;width:auto}}.checkbox-custom{position:relative;padding:0 15px 0 25px;margin-bottom:7px;display:inline-block}.checkbox-custom input[type="checkbox"]{opacity:0;position:absolute;cursor:pointer;z-index:2;margin:-6px 0 0 0;top:50%;left:3px}.checkbox-custom label:before{content:'';position:absolute;top:50%;left:0;margin-top:-9px;width:18px;height:17px;display:inline-block;border-radius:2px;border:1px solid #bbb;background:#fff}.checkbox-custom input[type="checkbox"]:checked+label:after{position:absolute;display:inline-block;font-family:'Glyphicons Halflings';content:"\e013";top:42%;left:3px;margin-top:-5px;font-size:11px;line-height:1;width:16px;height:16px;color:#333}.checkbox-custom label{cursor:pointer;line-height:1.2;font-weight:normal;margin-bottom:0;text-align:left}.form-control,.form-control:focus,.has-error .form-control:focus,.has-success .form-control:focus,.has-warning .form-control:focus,.navbar-collapse,.navbar-form,.navbar-form-custom .form-control:focus,.navbar-form-custom .form-control:hover,.open .btn.dropdown-toggle,.panel,.popover,.progress,.progress-bar{box-shadow:none}.form-control{border-radius:1px!important;padding:6px 12px!important;height:34px!important}.form-control:focus{border-color:#1ab394!important}body .layer-ext-moon-msg[type="dialog"]{min-width:100px!important}body .layer-ext-moon-msg{background-color:rgba(0,0,0,0.6);color:#fff;border:0}body .layer-ext-moon-msg .layui-layer-content{padding:12px 25px;text-align:center} \ No newline at end of file +html{height:100%}body.signin{height:auto;background:url(../img/login-background.png) no-repeat center fixed;-webkit-background-size:cover;-moz-background-size:cover;-o-background-size:cover;background-size:cover}.signinpanel{margin:10% auto 0;color:rgba(255,255,255,.95)}.signinpanel .logopanel{float:none;width:auto;padding:0;background:0}.signinpanel .signin-info ul{list-style:none;padding:0;margin:20px 0}.signinpanel .form-control{display:block;margin-top:15px}.signinpanel .uname{background:#fff url(../img/user.png) no-repeat 95% center;color:#333}.signinpanel .pword{background:#fff url(../img/locked.png) no-repeat 95% center;color:#333}.signinpanel .code{background:#fff no-repeat 95% center;color:#333;margin:0 0 15px 0}.signinpanel .btn{margin-top:15px}.signinpanel form{background:rgba(255,255,255,.2);border:1px solid rgba(255,255,255,.3);-moz-box-shadow:0 3px 0 rgba(12,12,12,.03);-webkit-box-shadow:0 3px 0 rgba(12,12,12,.03);box-shadow:0 3px 0 rgba(12,12,12,.03);-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;padding:30px}.signup-footer{border-top:solid 1px rgba(255,255,255,.3);margin:20px 0;padding-top:15px}@media screen and (max-width:768px){.signinpanel,.signuppanel{margin:0 auto;width:380px!important;padding:20px}.signinpanel form{margin-top:20px}.signup-footer,.signuppanel .form-control{margin-bottom:10px}.signup-footer .pull-left,.signup-footer .pull-right{float:none!important;text-align:center}.signinpanel .signin-info ul{display:none}}@media screen and (max-width:320px){.signinpanel,.signuppanel{margin:0 20px;width:auto}}.checkbox-custom{position:relative;padding:0 15px 0 25px;margin-bottom:7px;display:inline-block}.checkbox-custom input[type="checkbox"]{opacity:0;position:absolute;cursor:pointer;z-index:2;margin:-6px 0 0 0;top:50%;left:3px}.checkbox-custom label:before{content:'';position:absolute;top:50%;left:0;margin-top:-9px;width:18px;height:17px;display:inline-block;border-radius:2px;border:1px solid #bbb;background:#fff}.checkbox-custom input[type="checkbox"]:checked+label:after{position:absolute;display:inline-block;font-family:'Glyphicons Halflings';content:"\e013";top:42%;left:3px;margin-top:-5px;font-size:11px;line-height:1;width:16px;height:16px;color:#333}.checkbox-custom label{cursor:pointer;line-height:1.2;font-weight:normal;margin-bottom:0;text-align:left}.form-control,.form-control:focus,.has-error .form-control:focus,.has-success .form-control:focus,.has-warning .form-control:focus,.navbar-collapse,.navbar-form,.navbar-form-custom .form-control:focus,.navbar-form-custom .form-control:hover,.open .btn.dropdown-toggle,.panel,.popover,.progress,.progress-bar{box-shadow:none}.form-control{border-radius:1px!important;padding:6px 12px!important;height:34px!important}.form-control:focus{border-color:#1ab394!important}body .layer-ext-moon-msg[type="dialog"]{min-width:100px!important}body .layer-ext-moon-msg{background-color:rgba(0,0,0,0.6);color:#fff;border:0}body .layer-ext-moon-msg .layui-layer-content{padding:12px 25px;text-align:center} \ No newline at end of file diff --git a/blxc-admin/src/main/resources/static/portal/css/news.css b/blxc-admin/src/main/resources/static/portal/css/news.css index 65f0291..ec87a15 100644 --- a/blxc-admin/src/main/resources/static/portal/css/news.css +++ b/blxc-admin/src/main/resources/static/portal/css/news.css @@ -112,4 +112,5 @@ li{ .con li:first-child{ padding: 0 0 1.6rem; } -} */ \ No newline at end of file +} */ + diff --git a/blxc-admin/src/main/resources/static/portal/css/text.css b/blxc-admin/src/main/resources/static/portal/css/text.css index 7c06d1c..0010b22 100644 --- a/blxc-admin/src/main/resources/static/portal/css/text.css +++ b/blxc-admin/src/main/resources/static/portal/css/text.css @@ -163,4 +163,20 @@ 100% { background-position: 0% 0%; } +} + + +.con_down{ + width: 60rem; + margin: auto; +} + + +.down_button{ + padding: 0.3rem 0.5rem; + font-size: 13px; + color: #fff; + background: #062d7b; + border-radius: 5px; + margin-left: 30px; } \ No newline at end of file diff --git a/blxc-admin/src/main/resources/static/portal/js/page.js b/blxc-admin/src/main/resources/static/portal/js/page.js index 356ff1e..578579c 100644 --- a/blxc-admin/src/main/resources/static/portal/js/page.js +++ b/blxc-admin/src/main/resources/static/portal/js/page.js @@ -23,7 +23,6 @@ function generPage(total, dom_page_class) { } domStr += ` 尾页`; - console.log('domStr-->',domStr); document.querySelector('.' + dom_page_class).innerHTML = domStr } diff --git a/blxc-admin/src/main/resources/templates/login.html b/blxc-admin/src/main/resources/templates/login.html index d359462..5714716 100644 --- a/blxc-admin/src/main/resources/templates/login.html +++ b/blxc-admin/src/main/resources/templates/login.html @@ -25,15 +25,15 @@
- -
+

登录：

diff --git a/blxc-admin/src/main/resources/templates/news/news/add.html b/blxc-admin/src/main/resources/templates/news/news/add.html index 181a26f..abf5e4c 100644 --- a/blxc-admin/src/main/resources/templates/news/news/add.html +++ b/blxc-admin/src/main/resources/templates/news/news/add.html @@ -12,25 +12,18 @@
- - - -
- - - -
-
+
@@ -45,21 +38,12 @@
-
+
- - - - - - - - -
@@ -73,7 +57,7 @@
-
+
@@ -87,7 +71,7 @@
- +
@@ -142,6 +126,23 @@ }); } + function handleSecond(){ + var record = document.getElementById("newType").value; + if(record == '48'){ + $("#col1").css("display","none"); + $("#col3").css("display","none"); + $("#contentDiv").css("display","none"); + $("#linkUrlDiv").css("display","none"); + + }else{ + $("#col1").css("display","block"); + $("#col3").css("display","block"); + $("#contentDiv").css("display","block"); + $("#linkUrlDiv").css("display","block"); + handleRadioChange(); + } + } + $(function() { $("input[name='publishTime']").datetimepicker({ diff --git a/blxc-admin/src/main/resources/templates/news/news/edit.html b/blxc-admin/src/main/resources/templates/news/news/edit.html index 389b2db..3927499 100644 --- a/blxc-admin/src/main/resources/templates/news/news/edit.html +++ b/blxc-admin/src/main/resources/templates/news/news/edit.html @@ -10,39 +10,19 @@
- - - - - - - - -
- - - -
- -
- - - -
-
+
@@ -57,7 +37,7 @@
-
+
@@ -85,7 +65,7 @@
-
+
@@ -103,24 +83,6 @@
- - - - - - - - - - - - - - - - - -
@@ -167,6 +129,26 @@ }); } + function handleSecond(newType){ + var record = document.getElementById("newType").value; + if(newType!=''){ + record = newType; + } + if(record == '48'){ + $("#col1").css("display","none"); + $("#col3").css("display","none"); + $("#contentDiv").css("display","none"); + $("#linkUrlDiv").css("display","none"); + + }else{ + $("#col1").css("display","block"); + $("#col3").css("display","block"); + $("#contentDiv").css("display","block"); + $("#linkUrlDiv").css("display","block"); + handleRadioChange(); + } + } + $(function() { var ndNew = [[${ndNew}]]; // 直接返回获取 @@ -178,7 +160,7 @@ // }); document.getElementById("firstType").value =ndNew.firstType; handleFirst(ndNew.newType); - + handleSecond(ndNew.newType) $('.summernote').each(function(i) { $('#' + this.id).summernote({ lang: 'zh-CN', diff --git a/blxc-admin/src/main/resources/templates/portal/downList.html b/blxc-admin/src/main/resources/templates/portal/downList.html new file mode 100644 index 0000000..0a48bd5 --- /dev/null +++ b/blxc-admin/src/main/resources/templates/portal/downList.html @@ -0,0 +1,223 @@ + + + + + + + 吉林省新农科长白山创新学院 + + + + + + + + + + + + + + + + + + +
+
+
+
+ +
+
+
+ +
+ + 首页 > + 下载专栏 +
+
+ + + +
    +
+ + +
+
+
+
+
+
+
+ +
+ + + + + + + + diff --git a/blxc-admin/src/main/resources/templates/portal/headerAndFooter.html b/blxc-admin/src/main/resources/templates/portal/headerAndFooter.html index 4f54cde..3c2981a 100644 --- a/blxc-admin/src/main/resources/templates/portal/headerAndFooter.html +++ b/blxc-admin/src/main/resources/templates/portal/headerAndFooter.html @@ -161,6 +161,9 @@
+
  • + 下载专栏 +
    • diff --git a/blxc-framework/target/classes/com/ruoyi/framework/config/ShiroConfig.class b/blxc-framework/target/classes/com/ruoyi/framework/config/ShiroConfig.class index e2f38fe..e924204 100644 Binary files a/blxc-framework/target/classes/com/ruoyi/framework/config/ShiroConfig.class and b/blxc-framework/target/classes/com/ruoyi/framework/config/ShiroConfig.class differ diff --git a/blxc-system/src/main/resources/mapper/portal/back/NdNewMapper.xml b/blxc-system/src/main/resources/mapper/portal/back/NdNewMapper.xml index 6379ad4..6b41959 100644 --- a/blxc-system/src/main/resources/mapper/portal/back/NdNewMapper.xml +++ b/blxc-system/src/main/resources/mapper/portal/back/NdNewMapper.xml @@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.title like concat('%', #{title}, '%') and a.publish_time between #{params.beginPublishTime} and #{params.endPublishTime} - order by a.publish_time desc + order by a.publish_time desc,a.create_time desc limit ${paramLimitno} diff --git a/blxc-system/target/classes/mapper/portal/back/NdNewMapper.xml b/blxc-system/target/classes/mapper/portal/back/NdNewMapper.xml index 005ade6..6b41959 100644 --- a/blxc-system/target/classes/mapper/portal/back/NdNewMapper.xml +++ b/blxc-system/target/classes/mapper/portal/back/NdNewMapper.xml @@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.title like concat('%', #{title}, '%') and a.publish_time between #{params.beginPublishTime} and #{params.endPublishTime} - order by a.publish_time desc + order by a.publish_time desc,a.create_time desc limit ${paramLimitno} @@ -158,7 +158,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"