Alawn/Aurora
1
0
Fork 0
mirror of https://github.com/dqjdda/Aurora.git synced 2018-11-06 05:33:29 +00:00
Code Releases Activity

忘了改了啥，修复LM-develop指出的 图标显示异常的bug

Browse Source
This commit is contained in:
郑杰
2018-09-26 17:17:25 +08:00
parent 32b286583e
commit fd6600e239
15 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/me/aurora/AuroraRun.java
-3
View File
@@ -1,17 +1,14 @@
package me.aurora;
import me.aurora.config.AuroraProperties;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import org.springframework.web.bind.annotation.GetMapping;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
@Controller
@EnableCaching
src/main/java/me/aurora/app/rest/common/CommonController.java
+21
View File
@@ -0,0 +1,21 @@
package me.aurora.app.rest.common;
import me.aurora.annotation.Log;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.ModelAndView;
/**
* 公共的controller
* @author 郑杰
* @date 2018/09/25 19:08:41
*/
@RestController
public class CommonController {
@Log("访问swagger页面")
@GetMapping(value = "/swagger/index")
public ModelAndView swagger(){
return new ModelAndView("/system/api/index");
}
}
src/main/java/me/aurora/app/rest/ueditor/UEditorController.java → src/main/java/me/aurora/app/rest/ueditor/UeditorController.java
+3 -1
View File
@@ -1,5 +1,6 @@
package me.aurora.app.rest.ueditor;
import me.aurora.annotation.Log;
import me.aurora.config.baidu.ueditor.ActionEnter;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,8 +17,9 @@ import java.io.PrintWriter;
*/
@RestController
@RequestMapping("ueditor")
public class UEditorController {
public class UeditorController {
@Log("访问富文本编辑器")
@GetMapping(value = "/index")
private ModelAndView index(){
return new ModelAndView("/ueditor/index");
src/main/java/me/aurora/config/ConfigurerAdapter.java
-2
View File
@@ -31,7 +31,5 @@ public class ConfigurerAdapter implements WebMvcConfigurer {
//跳转登陆注册页面
registry.addViewController("/login.html").setViewName("/user/login");
registry.addViewController("/signUp.html").setViewName("/register");
//跳转到swagger页面
registry.addViewController("/swagger/index").setViewName("/system/api/index");
}
}
src/main/resources/application.yml
+3 -3
View File
@@ -8,10 +8,10 @@ spring:
# 数据库访问配置, 使用druid数据源
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
# url: jdbc:log4jdbc:mysql://118.25.192.171:3306/aurora?useUnicode=true&characterEncoding=utf8
url: jdbc:log4jdbc:mysql://localhost:3306/aurora?useUnicode=true&characterEncoding=utf8
url: jdbc:log4jdbc:mysql://118.25.192.171:3306/aurora?useUnicode=true&characterEncoding=utf8
# url: jdbc:log4jdbc:mysql://localhost:3306/aurora?useUnicode=true&characterEncoding=utf8
username: root
password: 123456
password: dqjdda@1996@.
# 连接池配置
initial-size: 5
min-idle: 5
src/main/resources/static/plugins/font/iconfont.eot
BIN
View File
Binary file not shown.
src/main/resources/static/plugins/font/iconfont.ttf
BIN
View File
Binary file not shown.
src/main/resources/static/plugins/font/iconfont.woff
BIN
View File
Binary file not shown.
src/main/resources/templates/system/log/index.html
+1 -1
View File
@@ -67,7 +67,7 @@
,cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 新增
,cols: [
[
{field:'id',align:'center', width:70, title: '序号'}
{field:'id',align:'center', width:70, title: '编号'}
,{field:'username', title: '用户昵称'}
,{field:'ip', title: '用户IP'}
,{field:'location', title: 'IP来源'}
src/main/resources/templates/system/menu/index.html
+1 -1
View File
@@ -90,7 +90,7 @@
,cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 新增
,cols: [
[
{field:'id',align:'center', width:70, title: '序号'}
{field:'id',align:'center', width:70, title: '编号'}
,{field:'name', title: '菜单名称'}
,{field:'ico', title: '菜单图标',align:'center', width:100}
,{field:'url', title: '链接地址'}
src/main/resources/templates/system/permission/index.html
+1 -1
View File
@@ -97,7 +97,7 @@
,cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 新增
,cols: [
[
{field:'id',align:'center', width:70, title: '序号'}
{field:'id',align:'center', width:70, title: '编号'}
,{field:'perms', title: '权限名称'}
,{field:'remark', title: '权限说明'}
,{field:'createTime', title: '创建日期'}
src/main/resources/templates/system/role/index.html
+1 -1
View File
@@ -86,7 +86,7 @@
,cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 新增
,cols: [
[
{field:'id',align:'center', width:70, unresize: true, title: '序号'}
{field:'id',align:'center', width:70, unresize: true, title: '编号'}
,{field:'name', title: '角色名称'}
,{field:'remark', title: '角色说明'}
,{field:'createDateTime', title: '创建日期'}
src/main/resources/templates/user/index.html
+1 -1
View File
@@ -101,7 +101,7 @@
,cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 新增
,cols: [
[
{field:'id',align:'center', width:70, title: '序号'}
{field:'id',align:'center', width:70, title: '编号'}
,{field:'username', title: '用户昵称'}
,{field:'email', title: '邮箱'}
,{field:'createDateTime', title: '创建时间'}
src/main/resources/templates/user/login.html
+2 -2
View File
@@ -20,7 +20,7 @@
<div class="kit-login-col">
<i class="layui-icon">&#xe612;</i>
<span class="kit-login-input">
<input type="text" name="username" id="username" value="zhengjie@tom.com" lay-verify="required" placeholder="请输入用户名/邮箱 ->anyone" />
<input type="text" name="username" id="username" value="zhengjie@tom.com" lay-verify="required" placeholder="请输入用户名/邮箱" />
</span>
</div>
<div class="kit-login-col"></div>
@@ -29,7 +29,7 @@
<div class="kit-login-col">
<i class="layui-icon">&#xe64c;</i>
<span class="kit-login-input">
<input type="password" name="password" id="password" value="dqjdda1996." lay-verify="required" placeholder="请输入密码->anyone123" />
<input type="password" name="password" id="password" value="dqjdda1996." lay-verify="required" placeholder="请输入密码" />
</span>
</div>
<div class="kit-login-col"></div>
src/main/resources/templates/web/picture/index.html
+1 -1
View File
@@ -83,7 +83,7 @@
,cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 新增
,cols: [
[
{field:'id',align:'center', width:70, title: '序号'}
{field:'id',align:'center', width:70, title: '编号'}
,{field:'filename', title: '文件名'}
,{field:'userName', title: '上传者'}
,{field:'url', title: '图片地址'}