移除不需要的展示信息
This commit is contained in:
parent
f622624b43
commit
fa7cc89227
|
|
@ -9,7 +9,7 @@
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<artifactId>ruoyi-admin</artifactId>
|
<artifactId>dfm-1.0</artifactId>
|
||||||
|
|
||||||
<description>
|
<description>
|
||||||
web服务入口
|
web服务入口
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ spring:
|
||||||
druid:
|
druid:
|
||||||
# 主库数据源
|
# 主库数据源
|
||||||
master:
|
master:
|
||||||
url: jdbc:mysql://localhost:3306/dfm-ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
url: jdbc:mysql://localhost:3306/dfm-ry2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||||
username: dave
|
username: dave
|
||||||
password: 5253232
|
password: 5253232
|
||||||
# 从库数据源
|
# 从库数据源
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
<!-- 这个日志配置文件,区分了windows和linux机器,windows机器日志输出到控制台,linux机器日志输出文件,这个配置满足大部分项目需求 -->
|
<!-- 这个日志配置文件,区分了windows和linux机器,windows机器日志输出到控制台,linux机器日志输出文件,这个配置满足大部分项目需求 -->
|
||||||
<if condition='property("os.name").contains("Windows")'>
|
<if condition='property("os.name").contains("Windows")'>
|
||||||
<then>
|
<then>
|
||||||
|
<property name="LOG_HOME" value="${user.dir}/log" />
|
||||||
<!-- 控制台输出 -->
|
<!-- 控制台输出 -->
|
||||||
<appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
|
<appender name="Console" class="ch.qos.logback.core.ConsoleAppender">
|
||||||
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
|
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
|
||||||
|
|
@ -10,11 +11,37 @@
|
||||||
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
|
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
|
||||||
</encoder>
|
</encoder>
|
||||||
</appender>
|
</appender>
|
||||||
<logger name="com.ruoyi" level="DEBUG" />
|
|
||||||
<logger name="ch.qos.logback" level="WARN" />
|
<!-- 日志输出格式 -->
|
||||||
<root level="DEBUG">
|
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
|
||||||
|
<!-- 普通日志,INFO -->
|
||||||
|
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||||
|
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||||
|
<FileNamePattern>
|
||||||
|
${LOG_HOME}/%d{yyyy-MM-dd}.%i.log
|
||||||
|
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
|
||||||
|
<maxFileSize>100MB</maxFileSize>
|
||||||
|
</timeBasedFileNamingAndTriggeringPolicy>
|
||||||
|
</FileNamePattern>
|
||||||
|
<!-- 保留最多15天的日志,过期的日志会被自动删除 -->
|
||||||
|
<maxHistory>10</maxHistory>
|
||||||
|
<!-- 保留最多3GB的日志,过期的日志会被自动删除 -->
|
||||||
|
<totalSizeCap>3GB</totalSizeCap>
|
||||||
|
</rollingPolicy>
|
||||||
|
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
|
||||||
|
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
|
||||||
|
</encoder>
|
||||||
|
</appender>
|
||||||
|
<root level="INFO">
|
||||||
<appender-ref ref="Console" /><!-- 输出到控制台-->
|
<appender-ref ref="Console" /><!-- 输出到控制台-->
|
||||||
</root>
|
</root>
|
||||||
|
<logger name="com.ruoyi" level="INFO" />
|
||||||
|
<logger name="ch.qos.logback" level="WARN" />
|
||||||
|
<!-- Spring日志级别控制 -->
|
||||||
|
<logger name="org.springframework" level="warn" />
|
||||||
|
<root level="DEBUG">
|
||||||
|
<appender-ref ref="FILE" />
|
||||||
|
</root>
|
||||||
</then>
|
</then>
|
||||||
<else>
|
<else>
|
||||||
<property name="LOG_HOME" value="${user.dir}/log" />
|
<property name="LOG_HOME" value="${user.dir}/log" />
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
<meta charset="utf-8">
|
<meta charset="utf-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<meta name="renderer" content="webkit">
|
<meta name="renderer" content="webkit">
|
||||||
<title>DFM管理系统</title>
|
<title>数字化工艺设计平台</title>
|
||||||
<!-- 避免IE使用兼容模式 -->
|
<!-- 避免IE使用兼容模式 -->
|
||||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||||
<link th:href="@{favicon.ico}" rel="shortcut icon"/>
|
<link th:href="@{favicon.ico}" rel="shortcut icon"/>
|
||||||
|
|
@ -26,7 +26,7 @@
|
||||||
</div>
|
</div>
|
||||||
<a th:href="@{/index}">
|
<a th:href="@{/index}">
|
||||||
<li class="logo hidden-xs">
|
<li class="logo hidden-xs">
|
||||||
<span class="logo-lg">DFM</span>
|
<span class="logo-lg" style="font-size:18px;font-weight:bold;">数字化工艺设计平台</span>
|
||||||
</li>
|
</li>
|
||||||
</a>
|
</a>
|
||||||
<div class="sidebar-collapse">
|
<div class="sidebar-collapse">
|
||||||
|
|
@ -42,7 +42,7 @@
|
||||||
<div class="pull-left info">
|
<div class="pull-left info">
|
||||||
<p>[[${user.name}]]</p>
|
<p>[[${user.name}]]</p>
|
||||||
<a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
|
<a href="#"><i class="fa fa-circle text-success"></i> 在线</a>
|
||||||
<a th:href="@{logout}" style="padding-left:5px;"><i class="fa fa-sign-out text-danger"></i> 注销</a>
|
<!--<a th:href="@{logout}" style="padding-left:5px;"><i class="fa fa-sign-out text-danger"></i> 注销</a>-->
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
|
|
@ -200,14 +200,14 @@
|
||||||
<span class="hidden-xs">[[${#strings.defaultString(user.name, '-')}]]</span>
|
<span class="hidden-xs">[[${#strings.defaultString(user.name, '-')}]]</span>
|
||||||
</a>
|
</a>
|
||||||
<ul class="dropdown-menu">
|
<ul class="dropdown-menu">
|
||||||
<li class="mt5">
|
<!--<li class="mt5">-->
|
||||||
<a th:href="@{/system/user/profile}" class="menuItem">
|
<!--<a th:href="@{/system/user/profile}" class="menuItem">-->
|
||||||
<i class="fa fa-user"></i> 个人中心</a>
|
<!--<i class="fa fa-user"></i> 个人中心</a>-->
|
||||||
</li>
|
<!--</li>-->
|
||||||
<li>
|
<!--<li>-->
|
||||||
<a onclick="resetPwd()">
|
<!--<a onclick="resetPwd()">-->
|
||||||
<i class="fa fa-key"></i> 修改密码</a>
|
<!--<i class="fa fa-key"></i> 修改密码</a>-->
|
||||||
</li>
|
<!--</li>-->
|
||||||
<li>
|
<li>
|
||||||
<a onclick="switchSkin()">
|
<a onclick="switchSkin()">
|
||||||
<i class="fa fa-dashboard"></i> 切换主题</a>
|
<i class="fa fa-dashboard"></i> 切换主题</a>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue