diff --git a/src/main/java/me/aurora/AuroraRun.java b/src/main/java/me/aurora/AuroraRun.java
index 7ce6ea1..78eae37 100644
--- a/src/main/java/me/aurora/AuroraRun.java
+++ b/src/main/java/me/aurora/AuroraRun.java
@@ -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
diff --git a/src/main/java/me/aurora/app/rest/common/CommonController.java b/src/main/java/me/aurora/app/rest/common/CommonController.java
new file mode 100644
index 0000000..3e51964
--- /dev/null
+++ b/src/main/java/me/aurora/app/rest/common/CommonController.java
@@ -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");
+ }
+}
diff --git a/src/main/java/me/aurora/app/rest/ueditor/UEditorController.java b/src/main/java/me/aurora/app/rest/ueditor/UeditorController.java
similarity index 92%
rename from src/main/java/me/aurora/app/rest/ueditor/UEditorController.java
rename to src/main/java/me/aurora/app/rest/ueditor/UeditorController.java
index ffd0994..77ccdb1 100644
--- a/src/main/java/me/aurora/app/rest/ueditor/UEditorController.java
+++ b/src/main/java/me/aurora/app/rest/ueditor/UeditorController.java
@@ -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");
diff --git a/src/main/java/me/aurora/config/ConfigurerAdapter.java b/src/main/java/me/aurora/config/ConfigurerAdapter.java
index df026af..18eb430 100644
--- a/src/main/java/me/aurora/config/ConfigurerAdapter.java
+++ b/src/main/java/me/aurora/config/ConfigurerAdapter.java
@@ -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");
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b103d24..b4afd7d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -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
diff --git a/src/main/resources/static/plugins/font/iconfont.eot b/src/main/resources/static/plugins/font/iconfont.eot
index e69de29..51c4f89 100644
Binary files a/src/main/resources/static/plugins/font/iconfont.eot and b/src/main/resources/static/plugins/font/iconfont.eot differ
diff --git a/src/main/resources/static/plugins/font/iconfont.ttf b/src/main/resources/static/plugins/font/iconfont.ttf
index e69de29..43a3161 100644
Binary files a/src/main/resources/static/plugins/font/iconfont.ttf and b/src/main/resources/static/plugins/font/iconfont.ttf differ
diff --git a/src/main/resources/static/plugins/font/iconfont.woff b/src/main/resources/static/plugins/font/iconfont.woff
index e69de29..7fd98e3 100644
Binary files a/src/main/resources/static/plugins/font/iconfont.woff and b/src/main/resources/static/plugins/font/iconfont.woff differ
diff --git a/src/main/resources/templates/system/log/index.html b/src/main/resources/templates/system/log/index.html
index 4c27b77..e05047a 100644
--- a/src/main/resources/templates/system/log/index.html
+++ b/src/main/resources/templates/system/log/index.html
@@ -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来源'}
diff --git a/src/main/resources/templates/system/menu/index.html b/src/main/resources/templates/system/menu/index.html
index b626d07..8279bce 100644
--- a/src/main/resources/templates/system/menu/index.html
+++ b/src/main/resources/templates/system/menu/index.html
@@ -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: '链接地址'}
diff --git a/src/main/resources/templates/system/permission/index.html b/src/main/resources/templates/system/permission/index.html
index d4b458d..a4d66f0 100644
--- a/src/main/resources/templates/system/permission/index.html
+++ b/src/main/resources/templates/system/permission/index.html
@@ -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: '创建日期'}
diff --git a/src/main/resources/templates/system/role/index.html b/src/main/resources/templates/system/role/index.html
index 3bab240..1473130 100644
--- a/src/main/resources/templates/system/role/index.html
+++ b/src/main/resources/templates/system/role/index.html
@@ -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: '创建日期'}
diff --git a/src/main/resources/templates/user/index.html b/src/main/resources/templates/user/index.html
index 52bfb54..429ff39 100644
--- a/src/main/resources/templates/user/index.html
+++ b/src/main/resources/templates/user/index.html
@@ -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: '创建时间'}
diff --git a/src/main/resources/templates/user/login.html b/src/main/resources/templates/user/login.html
index 4727a4e..4d02651 100644
--- a/src/main/resources/templates/user/login.html
+++ b/src/main/resources/templates/user/login.html
@@ -20,7 +20,7 @@
-
+
@@ -29,7 +29,7 @@
-
+
diff --git a/src/main/resources/templates/web/picture/index.html b/src/main/resources/templates/web/picture/index.html
index 53fbddf..3992cb3 100644
--- a/src/main/resources/templates/web/picture/index.html
+++ b/src/main/resources/templates/web/picture/index.html
@@ -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: '图片地址'}