Kezdőlap Felfedezés Súgó
Regisztráció Bejelentkezés
chengpan
/
yuncai-scm
1
0
Másolás 0
Fájlok Problémák 0 Beolvasztási kérések 0 Wiki
Forráskód Böngészése

Merge branch 'master' of http://114.115.215.112:3000/yuncaikeji_gogs/RuoYi

wangming 2 éve
szülő
ecb47f65ac 54ecfd7a71
commit
e24a935bab
5 módosított fájl, 12 hozzáadás és 13 törlés
Osztott Nézet Diff Statisztika Mutatása
  1. 1 0
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
  2. 3 3
      ruoyi-admin/src/main/resources/templates/index.html
  3. 6 3
      ruoyi-admin/src/main/resources/templates/login.html
  4. 2 2
      ruoyi-admin/src/main/resources/templates/register.html
  5. 0 5
      ruoyi-system/src/main/java/com/ruoyi/opt/service/impl/ProcessInfoServiceImpl.java

+ 1 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
Fájl Megtekintése 

@@ -60,6 +60,7 @@ public class SysIndexController extends BaseController
 
         mmap.put("footer", footer);

         mmap.put("tagsView", tagsView);

         mmap.put("mainClass", contentMainClass(footer, tagsView));

+        mmap.put("projectName", RuoYiConfig.getName());

         mmap.put("copyrightYear", RuoYiConfig.getCopyrightYear());

         mmap.put("demoEnabled", RuoYiConfig.isDemoEnabled());

         mmap.put("isDefaultModifyPwd", initPasswordIsModify(user.getPwdUpdateDate()));

+ 3 - 3
ruoyi-admin/src/main/resources/templates/index.html
Fájl Megtekintése 

@@ -4,7 +4,7 @@
 
     <meta charset="utf-8">

     <meta name="viewport" content="width=device-width, initial-scale=1.0">

     <meta name="renderer" content="webkit">

-    <title>若依系统首页</title>

+    <title>保函系统首页</title>

     <!-- 避免IE使用兼容模式 -->

  	<meta http-equiv="X-UA-Compatible" content="IE=edge">

     <link th:href="@{favicon.ico}" rel="shortcut icon"/>

@@ -26,7 +26,7 @@
 
         </div>

         <a th:href="@{/index}">

             <li class="logo hidden-xs">

-                <span class="logo-lg">RuoYi</span>

+                <span class="logo-lg">[[${projectName}]]</span>

             </li>

          </a>

         <div class="sidebar-collapse">

@@ -251,7 +251,7 @@
 
         </div>

 

         <div th:if="${footer}" class="footer">

-            <div class="pull-right">© [[${copyrightYear}]] RuoYi Copyright </div>

+            <div class="pull-right">© [[${copyrightYear}]] [[${projectName}]] Copyright </div>

         </div>

     </div>

     <!--右侧部分结束-->

+ 6 - 3
ruoyi-admin/src/main/resources/templates/login.html
Fájl Megtekintése 

@@ -1,9 +1,9 @@
 
 <!DOCTYPE html>

-<html lang="zh" xmlns:th="http://www.thymeleaf.org">

+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns="http://www.w3.org/1999/html">

 <head>

     <meta charset="utf-8">

     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">

-    <title>登录若依系统</title>

+    <title>登录保函系统</title>

     <meta name="description" content="若依后台管理框架">

     <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>

     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>

@@ -37,7 +37,6 @@
 
                         <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Thymeleaf</li>

                         <li><i class="fa fa-arrow-circle-o-right m-r-xs"></i> Bootstrap</li>

                     </ul>-->

-                    <strong th:if="${isAllowRegister}">还没有账号？ <a th:href="@{/register}">立即注册&raquo;</a></strong>

                 </div>

             </div>

             <div class="col-sm-5">

@@ -58,6 +57,10 @@
 
 					</div>

                     <div class="checkbox-custom" th:if="${isRemembered}" th:classappend="${captchaEnabled==false} ? 'm-t'">

 				        <input type="checkbox" id="rememberme" name="rememberme"> <label for="rememberme">记住我</label>

+                        <strong th:if="${isAllowRegister}">

+                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+                            <a th:href="@{/register}">立即注册&raquo;</a></label>

+                        </strong>

 				    </div>

                     <button class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证登录，请稍候...">登录</button>

                 </form>

+ 2 - 2
ruoyi-admin/src/main/resources/templates/register.html
Fájl Megtekintése 

@@ -3,7 +3,7 @@
 
 <head>
 
     <meta charset="utf-8">
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
 
-    <title>注册若依系统</title>
 
+    <title>注册保函系统</title>
 
     <meta name="description" content="若依后台管理框架">
 
     <link href="../static/css/bootstrap.min.css" th:href="@{/css/bootstrap.min.css}" rel="stylesheet"/>
 
     <link href="../static/css/font-awesome.min.css" th:href="@{/css/font-awesome.min.css}" rel="stylesheet"/>
 
@@ -40,7 +40,7 @@
 
             <div class="col-sm-5">
 
                 <form id="registerForm" autocomplete="off">
 
                     <h4 class="no-margins">注册：</h4>
 
-                    <p class="m-t-md">你若不离不弃，我必生死相依</p>
 
+                    <!--<p class="m-t-md">你若不离不弃，我必生死相依</p>-->
 
                     <input type="text"     name="username" class="form-control uname"         placeholder="用户名"   maxlength="20" />
 
                     <input type="password" name="password" class="form-control pword"         placeholder="密码"     maxlength="20" />
 
                     <input type="password" name="confirmPassword" class="form-control pword"  placeholder="确认密码" maxlength="20" />

+ 0 - 5
ruoyi-system/src/main/java/com/ruoyi/opt/service/impl/ProcessInfoServiceImpl.java
Fájl Megtekintése 

@@ -1,14 +1,10 @@
 
 package com.ruoyi.opt.service.impl;
 
 
-import java.util.HashMap;
 
 import java.util.List;
 
 import java.util.Map;
 
 
 import com.alibaba.fastjson.JSON;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 
-import com.ruoyi.common.json.JSONObject;
 
 import com.ruoyi.common.request.CheckInformBo;
 
 import com.ruoyi.common.request.PayInfomBo;
 
 import com.ruoyi.common.utils.DateUtils;
 
@@ -24,7 +20,6 @@ import com.ruoyi.opt.mapper.ProcessInfoMapper;
 
 import com.ruoyi.opt.domain.ProcessInfo;
 
 import com.ruoyi.opt.service.IProcessInfoService;
 
 import com.ruoyi.common.core.text.Convert;
 
-import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import org.springframework.transaction.annotation.Propagation;
 
 import org.springframework.transaction.annotation.Transactional;
 
 import org.springframework.util.ObjectUtils;