From b8aa180ed06704f75baf59e0afb65162fca4d09d Mon Sep 17 00:00:00 2001 From: cjl Date: Fri, 22 Feb 2019 11:19:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AA=E5=8A=A0?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E7=9A=84=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- erp_web/pages/manage/roleApp.html | 277 +++++++------ erp_web/pages/manage/roleFunctions.html | 275 +++++++------ erp_web/pages/manage/rolePushBtn.html | 520 ++++++++++++------------ erp_web/pages/user/userCustomer.html | 275 +++++++------ erp_web/pages/user/userDepot.html | 274 +++++++------ erp_web/pages/user/userRole.html | 274 +++++++------ 6 files changed, 944 insertions(+), 951 deletions(-) diff --git a/erp_web/pages/manage/roleApp.html b/erp_web/pages/manage/roleApp.html index 27cfec56..a5ed06ef 100644 --- a/erp_web/pages/manage/roleApp.html +++ b/erp_web/pages/manage/roleApp.html @@ -1,140 +1,139 @@ - - - - 角色对应应用 - - - - - - - - - - - - - - -
- 保存 -
-
- -
- - - + + + + 角色对应应用 + + + + + + + + + + + + + + +
+ 保存 +
+
+ +
+ + + \ No newline at end of file diff --git a/erp_web/pages/manage/roleFunctions.html b/erp_web/pages/manage/roleFunctions.html index 97a5cd14..83abbd58 100644 --- a/erp_web/pages/manage/roleFunctions.html +++ b/erp_web/pages/manage/roleFunctions.html @@ -1,139 +1,138 @@ - - - - 角色对应应用 - - - - - - - - - - - - - - -
- 保存 -
-
- -
- - - + + + + 角色对应应用 + + + + + + + + + + + + + + +
+ 保存 +
+
+ +
+ + + \ No newline at end of file diff --git a/erp_web/pages/manage/rolePushBtn.html b/erp_web/pages/manage/rolePushBtn.html index e49028ea..f5511bf7 100644 --- a/erp_web/pages/manage/rolePushBtn.html +++ b/erp_web/pages/manage/rolePushBtn.html @@ -1,261 +1,261 @@ - - - - 角色分配按钮 - - - - - - - - - - - - - - -
- 保存 -
-
- -
-
-
-
- - - + + + + 角色分配按钮 + + + + + + + + + + + + + + +
+ 保存 +
+
+ +
+
+
+
+ + + \ No newline at end of file diff --git a/erp_web/pages/user/userCustomer.html b/erp_web/pages/user/userCustomer.html index 1e042741..67bfbe3c 100644 --- a/erp_web/pages/user/userCustomer.html +++ b/erp_web/pages/user/userCustomer.html @@ -1,139 +1,138 @@ - - - - 用户对应客户 - - - - - - - - - - - - - - -
- 保存 -
-
- -
- - - + + + + 用户对应客户 + + + + + + + + + + + + + + +
+ 保存 +
+
+ +
+ + + \ No newline at end of file diff --git a/erp_web/pages/user/userDepot.html b/erp_web/pages/user/userDepot.html index 1d9ee866..a725d283 100644 --- a/erp_web/pages/user/userDepot.html +++ b/erp_web/pages/user/userDepot.html @@ -1,139 +1,137 @@ - - - - 用户对应部门 - - - - - - - - - - - - - - -
- 保存 -
-
- -
- - - + + + + 用户对应部门 + + + + + + + + + + + + + + +
+ 保存 +
+
+ +
+ + + \ No newline at end of file diff --git a/erp_web/pages/user/userRole.html b/erp_web/pages/user/userRole.html index 23e15fb9..4913c278 100644 --- a/erp_web/pages/user/userRole.html +++ b/erp_web/pages/user/userRole.html @@ -1,139 +1,137 @@ - - - - 用户对应角色 - - - - - - - - - - - - - - -
- 保存 -
-
- -
- - - + + + + 用户对应角色 + + + + + + + + + + + + + + +
+ 保存 +
+
+ +
+ + + \ No newline at end of file From 3ce770bbfb03074c8d5aeb70d64b8e9c6c22a5a9 Mon Sep 17 00:00:00 2001 From: cjl Date: Fri, 22 Feb 2019 14:38:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=B7=AF=E8=BE=93=E5=87=BA=E5=BE=84=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.properties | 2 +- src/main/resources/log4j.xml | 4 ++++ src/main/resources/logback-spring.xml | 9 ++------- 3 files changed, 7 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/log4j.xml diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 6afb2970..b1d0eac9 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,7 +2,7 @@ server.port=8080 spring.datasource.url=jdbc:mysql://127.0.0.1:3306/jsh_erp?useUnicode=true&characterEncoding=utf8&useCursorFetch=true&defaultFetchSize=500&allowMultiQueries=true&rewriteBatchedStatements=true&useSSL=false spring.datasource.driverClassName=com.mysql.jdbc.Driver spring.datasource.username=root -spring.datasource.password=1234 +spring.datasource.password=123456 #generatorConfig专用属性 project=src/main/java resource=src/main/resources diff --git a/src/main/resources/log4j.xml b/src/main/resources/log4j.xml new file mode 100644 index 00000000..d5d833cc --- /dev/null +++ b/src/main/resources/log4j.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 2545d59f..c300ab40 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -4,13 +4,8 @@ - - - - logback - - - + + From f08a5c08338137d4b66ba2fadb221e9f162b3e1e Mon Sep 17 00:00:00 2001 From: cjl Date: Fri, 22 Feb 2019 18:02:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/log4j.xml | 4 ---- src/main/resources/logback-spring.xml | 9 +++++++-- 2 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 src/main/resources/log4j.xml diff --git a/src/main/resources/log4j.xml b/src/main/resources/log4j.xml deleted file mode 100644 index d5d833cc..00000000 --- a/src/main/resources/log4j.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index c300ab40..716fe85a 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -4,8 +4,13 @@ - - + + + + logback + + +