diff --git a/ant-design-vue-jeecg/public/index.html b/ant-design-vue-jeecg/public/index.html
index 8639212..12caf8c 100644
--- a/ant-design-vue-jeecg/public/index.html
+++ b/ant-design-vue-jeecg/public/index.html
@@ -13,8 +13,8 @@
body,
#app {
height: 100%;
- margin: 0px;
- padding: 0px;
+ margin: 0;
+ padding: 0;
}
.chromeframe {
margin: 0.2em 0;
diff --git a/ant-design-vue-jeecg/public/pdfjs/web/viewer.css b/ant-design-vue-jeecg/public/pdfjs/web/viewer.css
index e35bdda..252249b 100644
--- a/ant-design-vue-jeecg/public/pdfjs/web/viewer.css
+++ b/ant-design-vue-jeecg/public/pdfjs/web/viewer.css
@@ -31,7 +31,7 @@
position: absolute;
white-space: pre;
cursor: text;
- transform-origin: 0% 0%;
+ transform-origin: 0 0;
}
.textLayer .highlight {
@@ -1132,7 +1132,7 @@ html[dir="rtl"] #outerContainer.sidebarOpen #loadingBar {
position: absolute;
top: 0;
left: 0;
- width: 0%;
+ width: 0;
height: 100%;
background-color: var(--progressBar-color);
overflow: hidden;
diff --git a/ant-design-vue-jeecg/src/components/chart/README.md b/ant-design-vue-jeecg/src/components/chart/README.md
index d2789c8..950c698 100644
--- a/ant-design-vue-jeecg/src/components/chart/README.md
+++ b/ant-design-vue-jeecg/src/components/chart/README.md
@@ -102,7 +102,7 @@ import BarMultid from '@/components/chart/BarMultid'
```json
[
{
- "type": "Jeecg", // 列名
+ "type": "Jeecg",
"Jan.": 18.9,
"Feb.": 28.8,
"Mar.": 39.3,
@@ -227,7 +227,7 @@ import LineChartMultid from '@/components/chart/LineChartMultid'
```json
[
{
- "type": "Jan", // 列名
+ "type": "Jan",
"jeecg": 7,
"jeebt": 3.9
},
@@ -264,7 +264,6 @@ import Pie from '@/components/chart/Pie'
```json
[
- // 所有的 percent 相加等于 100
{ "item": "一月", "percent": 40 },
{ "item": "二月", "percent": 21 },
{ "item": "三月", "percent": 17 },
@@ -292,7 +291,6 @@ import Radar from '@/components/chart/Radar'
```json
[
- // score 最小值为 0,最大值为 100
{ "item": "一月", "score": 40 },
{ "item": "二月", "score": 20 },
{ "item": "三月", "score": 67 },
diff --git a/ant-design-vue-jeecg/src/components/jeecg/AJModal/index.vue b/ant-design-vue-jeecg/src/components/jeecg/AJModal/index.vue
index eb80a43..955b53c 100644
--- a/ant-design-vue-jeecg/src/components/jeecg/AJModal/index.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/AJModal/index.vue
@@ -264,8 +264,8 @@
&.no-title {
.ant-modal-header {
- padding: 0px 12px;
- border-bottom: 0px !important;
+ padding: 0 12px;
+ border-bottom: 0 !important;
}
}
}
diff --git a/ant-design-vue-jeecg/src/components/jeecg/BJModal/index.vue b/ant-design-vue-jeecg/src/components/jeecg/BJModal/index.vue
index d4a7699..7a6bba1 100644
--- a/ant-design-vue-jeecg/src/components/jeecg/BJModal/index.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/BJModal/index.vue
@@ -247,8 +247,8 @@
&.no-title {
.ant-modal-header {
- padding: 0px 12px;
- border-bottom: 0px !important;
+ padding: 0 12px;
+ border-bottom: 0 !important;
}
}
}
diff --git a/ant-design-vue-jeecg/src/components/jeecg/CJModal/index.vue b/ant-design-vue-jeecg/src/components/jeecg/CJModal/index.vue
index d6c7e52..241e8df 100644
--- a/ant-design-vue-jeecg/src/components/jeecg/CJModal/index.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/CJModal/index.vue
@@ -246,8 +246,8 @@
&.no-title {
.ant-modal-header {
- padding: 0px 12px;
- border-bottom: 0px !important;
+ padding: 0 12px;
+ border-bottom: 0 !important;
}
}
}
diff --git a/ant-design-vue-jeecg/src/components/jeecg/JImportModal.vue b/ant-design-vue-jeecg/src/components/jeecg/JImportModal.vue
index d231ab1..982c114 100644
--- a/ant-design-vue-jeecg/src/components/jeecg/JImportModal.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JImportModal.vue
@@ -6,7 +6,7 @@
:confirmLoading="uploading"
@cancel="handleClose">
-
+
是否开启校验:
diff --git a/ant-design-vue-jeecg/src/components/jeecg/JModal/index.vue b/ant-design-vue-jeecg/src/components/jeecg/JModal/index.vue
index 2f61800..c52ceb0 100644
--- a/ant-design-vue-jeecg/src/components/jeecg/JModal/index.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JModal/index.vue
@@ -227,8 +227,8 @@
}
&.no-title{
.ant-modal-header {
- padding: 0px 24px;
- border-bottom: 0px !important;
+ padding: 0 24px;
+ border-bottom: 0 !important;
}
}
}
diff --git a/ant-design-vue-jeecg/src/components/jeecg/JSlider.vue b/ant-design-vue-jeecg/src/components/jeecg/JSlider.vue
index 18fda68..eae4137 100644
--- a/ant-design-vue-jeecg/src/components/jeecg/JSlider.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JSlider.vue
@@ -2,7 +2,7 @@
@@ -101,11 +101,11 @@
.drag_bg{
background-color: #7ac23c;
height: 34px;
- width: 0px;
+ width: 0;
}
.drag_text{
position: absolute;
- top: 0px;
+ top: 0;
width: 100%;text-align: center;
-moz-user-select: none;
-webkit-user-select: none;
diff --git a/ant-design-vue-jeecg/src/components/jeecg/README.md b/ant-design-vue-jeecg/src/components/jeecg/README.md
index d8e48d1..7747dc5 100644
--- a/ant-design-vue-jeecg/src/components/jeecg/README.md
+++ b/ant-design-vue-jeecg/src/components/jeecg/README.md
@@ -172,7 +172,7 @@ this.$refs.superQueryModal.show();
diff --git a/ant-design-vue-jeecg/src/components/jeecg/modal/JCronModal.vue b/ant-design-vue-jeecg/src/components/jeecg/modal/JCronModal.vue
index 2727495..3a71a38 100644
--- a/ant-design-vue-jeecg/src/components/jeecg/modal/JCronModal.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/modal/JCronModal.vue
@@ -848,7 +848,7 @@
.ant-tabs-tab {
padding: 0 24px!important;
background-color: #f5f7fa!important;
- margin-right: 0px!important;
+ margin-right: 0!important;
border-radius: 0;
line-height: 38px;
border: 1px solid transparent!important;
diff --git a/ant-design-vue-jeecg/src/components/page/GlobalLayout.vue b/ant-design-vue-jeecg/src/components/page/GlobalLayout.vue
index d377b30..5658f93 100644
--- a/ant-design-vue-jeecg/src/components/page/GlobalLayout.vue
+++ b/ant-design-vue-jeecg/src/components/page/GlobalLayout.vue
@@ -74,7 +74,7 @@
-
+
@@ -555,7 +555,7 @@
// 内容区
.layout-content {
- margin: 24px 24px 0px;
+ margin: 24px 24px 0;
height: 64px;
padding: 0 12px 0 0;
}
@@ -663,7 +663,7 @@
.ant-dropdown-menu-item > .anticon:first-child,
.ant-dropdown-menu-item > a > .anticon:first-child,
- .ant-dropdown-menu-submenu-title > .anticon:first-child
+ .ant-dropdown-menu-submenu-title > .anticon:first-child,
.ant-dropdown-menu-submenu-title > a > .anticon:first-child {
min-width: 12px;
margin-right: 8px;
diff --git a/ant-design-vue-jeecg/src/components/page/PageLayout.vue b/ant-design-vue-jeecg/src/components/page/PageLayout.vue
index 191fd8a..43b0e6f 100644
--- a/ant-design-vue-jeecg/src/components/page/PageLayout.vue
+++ b/ant-design-vue-jeecg/src/components/page/PageLayout.vue
@@ -122,6 +122,6 @@
margin-top: 48px;
}
.page-header[data-v-6740ec88] {
- margin: 0px 24px 0;
+ margin: 0 24px 0;
}
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/components/setting/SettingDrawer.vue b/ant-design-vue-jeecg/src/components/setting/SettingDrawer.vue
index 79f5e9e..92045b8 100644
--- a/ant-design-vue-jeecg/src/components/setting/SettingDrawer.vue
+++ b/ant-design-vue-jeecg/src/components/setting/SettingDrawer.vue
@@ -286,8 +286,8 @@
float: left;
cursor: pointer;
margin-right: 8px;
- padding-left: 0px;
- padding-right: 0px;
+ padding-left: 0;
+ padding-right: 0;
text-align: center;
color: #fff;
font-weight: 700;
diff --git a/ant-design-vue-jeecg/src/components/tools/HeaderNotice.vue b/ant-design-vue-jeecg/src/components/tools/HeaderNotice.vue
index 1d15db9..873389c 100644
--- a/ant-design-vue-jeecg/src/components/tools/HeaderNotice.vue
+++ b/ant-design-vue-jeecg/src/components/tools/HeaderNotice.vue
@@ -32,7 +32,7 @@
一般消息
@@ -50,7 +50,7 @@
一般消息
diff --git a/ant-design-vue-jeecg/src/views/km/search/DefaultDocSearch.vue b/ant-design-vue-jeecg/src/views/km/search/DefaultDocSearch.vue
index ffcea43..9de7590 100644
--- a/ant-design-vue-jeecg/src/views/km/search/DefaultDocSearch.vue
+++ b/ant-design-vue-jeecg/src/views/km/search/DefaultDocSearch.vue
@@ -46,7 +46,7 @@
-
+
@@ -104,7 +104,7 @@
-
+
-
+
diff --git a/ant-design-vue-jeecg/src/views/system/UserAnnouncementList.vue b/ant-design-vue-jeecg/src/views/system/UserAnnouncementList.vue
index 81c8aa6..179fbd5 100644
--- a/ant-design-vue-jeecg/src/views/system/UserAnnouncementList.vue
+++ b/ant-design-vue-jeecg/src/views/system/UserAnnouncementList.vue
@@ -184,7 +184,7 @@
margin-bottom: 18px;
}
.anty-row-operator button{margin: 0 5px}
- .ant-btn-danger{background-color: #ffffff}z
+ .ant-btn-danger{background-color: #ffffff}
.ant-modal-cust-warp{height: 100%}
.ant-modal-cust-warp .ant-modal-body{height:calc(100% - 110px) !important;overflow-y: auto}
diff --git a/ant-design-vue-jeecg/src/views/system/modules/DataLogCompareModal.vue b/ant-design-vue-jeecg/src/views/system/modules/DataLogCompareModal.vue
index e02bb02..5a69190 100644
--- a/ant-design-vue-jeecg/src/views/system/modules/DataLogCompareModal.vue
+++ b/ant-design-vue-jeecg/src/views/system/modules/DataLogCompareModal.vue
@@ -159,5 +159,5 @@
margin-top: 20px;
}
- @import '../../../assets/less/index.less';
+ @import '@/assets/less/index.less';
\ No newline at end of file
diff --git a/ant-design-vue-jeecg/src/views/system/modules/UserModal.vue b/ant-design-vue-jeecg/src/views/system/modules/UserModal.vue
index 0f47849..a65df3a 100644
--- a/ant-design-vue-jeecg/src/views/system/modules/UserModal.vue
+++ b/ant-design-vue-jeecg/src/views/system/modules/UserModal.vue
@@ -13,7 +13,7 @@
diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java
index d52d072..817be91 100644
--- a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java
+++ b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java
@@ -177,7 +177,7 @@ public class JeecgController> {
//1200条 saveBatch消耗时间3687毫秒 循环插入消耗时间5212毫秒
log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
//update-end-author:taoyan date:20190528 for:批量插入数据
- return Result.ok("文件导入成功!数据行数:" + list.size());
+ return Result.OK("文件导入成功!数据行数:" + list.size());
} catch (Exception e) {
log.error(e.getMessage(), e);
return Result.error("文件导入失败:" + e.getMessage());
diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ImportExcelUtil.java b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ImportExcelUtil.java
index dcb72dd..aaada80 100644
--- a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ImportExcelUtil.java
+++ b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/ImportExcelUtil.java
@@ -18,7 +18,7 @@ public class ImportExcelUtil {
public static Result> imporReturnRes(int errorLines,int successLines,List errorMessage) throws IOException {
if (errorLines == 0) {
- return Result.ok("共" + successLines + "行数据全部导入成功!");
+ return Result.OK("共" + successLines + "行数据全部导入成功!");
} else {
JSONObject result = new JSONObject(5);
int totalCount = successLines + errorLines;
@@ -31,7 +31,7 @@ public class ImportExcelUtil {
String fileName = fileUrl.substring(lastIndex + 1);
result.put("fileUrl", "/sys/common/static/" + fileUrl);
result.put("fileName", fileName);
- Result res = Result.ok(result);
+ Result res = Result.OK(result);
res.setCode(201);
res.setMessage("文件导入成功,但有错误。");
return res;
diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java
index 1ecb69b..4ed574a 100644
--- a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java
+++ b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/PasswordUtil.java
@@ -9,10 +9,10 @@ import javax.crypto.spec.PBEKeySpec;
import javax.crypto.spec.PBEParameterSpec;
public class PasswordUtil {
- /**
- * JAVA6支持以下任意一种算法 PBEWITHMD5ANDDES PBEWITHMD5ANDTRIPLEDES
- * PBEWITHSHAANDDESEDE PBEWITHSHA1ANDRC2_40 PBKDF2WITHHMACSHA1
- * */
+ /*
+ JAVA6支持以下任意一种算法 PBEWITHMD5ANDDES PBEWITHMD5ANDTRIPLEDES
+ PBEWITHSHAANDDESEDE PBEWITHSHA1ANDRC2_40 PBKDF2WITHHMACSHA1
+ */
/**
* 定义使用的算法为:PBEWITHMD5andDES算法
@@ -27,7 +27,7 @@ public class PasswordUtil {
/**
* 获取加密算法中使用的盐值,解密中使用的盐值必须与加密中使用的相同才能完成操作. 盐长度必须为8字节
- *
+ *
* @return byte[] 盐值
* */
public static byte[] getSalt() throws Exception {
@@ -44,7 +44,7 @@ public class PasswordUtil {
/**
* 根据PBE密码生成一把密钥
- *
+ *
* @param password
* 生成密钥时所使用的密码
* @return Key PBE算法密钥
@@ -69,7 +69,7 @@ public class PasswordUtil {
/**
* 加密明文字符串
- *
+ *
* @param plaintext
* 待加密的明文字符串
* @param password
@@ -98,7 +98,7 @@ public class PasswordUtil {
/**
* 解密密文字符串
- *
+ *
* @param ciphertext
* 待解密的密文字符串
* @param password
@@ -129,7 +129,7 @@ public class PasswordUtil {
/**
* 将字节数组转换为十六进制字符串
- *
+ *
* @param src
* 字节数组
* @return
@@ -152,7 +152,7 @@ public class PasswordUtil {
/**
* 将十六进制字符串转换为字节数组
- *
+ *
* @param hexString
* 十六进制字符串
* @return
@@ -177,4 +177,4 @@ public class PasswordUtil {
}
-}
\ No newline at end of file
+}
diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/YouBianCodeUtil.java b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/YouBianCodeUtil.java
index ede4fae..3f7c83a 100644
--- a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/YouBianCodeUtil.java
+++ b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/YouBianCodeUtil.java
@@ -20,7 +20,7 @@ public class YouBianCodeUtil {
/**
* 根据前一个code,获取同级下一个code
* 例如:当前最大code为D01A04,下一个code为:D01A05
- *
+ *
* @param code
* @return
*/
@@ -67,11 +67,11 @@ public class YouBianCodeUtil {
/**
* 根据父亲code,获取下级的下一个code
- *
+ *
* 例如:父亲CODE:A01
* 当前CODE:A01B03
* 获取的code:A01B04
- *
+ *
* @param parentCode 上级code
* @param localCode 同级code
* @return
@@ -88,11 +88,11 @@ public class YouBianCodeUtil {
return parentCode;
}
-
+
/**
* 将数字前面位数补零
- *
+ *
* @param num
* @return
*/
@@ -102,7 +102,7 @@ public class YouBianCodeUtil {
/**
* 将数字前面位数补零
- *
+ *
* @param num
* @return
*/
@@ -113,7 +113,7 @@ public class YouBianCodeUtil {
/**
* 递增获取下个数字
- *
+ *
* @param num
* @return
*/
@@ -124,8 +124,8 @@ public class YouBianCodeUtil {
/**
* 递增获取下个字母
- *
- * @param num
+ *
+ * @param zimu
* @return
*/
private static char getNextZiMu(char zimu) {
@@ -135,7 +135,7 @@ public class YouBianCodeUtil {
zimu++;
return zimu;
}
-
+
/**
* 根据数字位数获取最大值
* @param length
@@ -163,7 +163,7 @@ public class YouBianCodeUtil {
}
return cutcode;
}
-
+
}
// public static void main(String[] args) {
// // org.jeecgframework.core.util.LogUtil.info(getNextZiMu('C'));
diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java
index a2c4358..afdbddd 100644
--- a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java
+++ b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java
@@ -23,7 +23,7 @@ public class AesEncryptUtil {
* @return 加密的结果
* @throws Exception
*/
- public static String encrypt(String data, String key, String iv) throws Exception {
+ public static String encrypt(String data, String key, String iv) {
try {
Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding");//"算法/模式/补码方式"NoPadding PkcsPadding
@@ -60,7 +60,7 @@ public class AesEncryptUtil {
* @return 解密的结果
* @throws Exception
*/
- public static String desEncrypt(String data, String key, String iv) throws Exception {
+ public static String desEncrypt(String data, String key, String iv) {
try {
byte[] encrypted1 = Base64.decode(data);
diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java
index 6192fc7..b451c18 100644
--- a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java
+++ b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java
@@ -21,7 +21,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
- *
+ *
* @Author 张代浩
*
*/
@@ -39,7 +39,7 @@ public class oConvertUtils {
}
return (false);
}
-
+
public static boolean isNotEmpty(Object object) {
if (object != null && !object.equals("") && !object.equals("null")) {
return (true);
@@ -163,7 +163,7 @@ public class oConvertUtils {
return (defval);
}
}
-
+
public static Integer getInt(Object object) {
if (isEmpty(object)) {
return null;
@@ -199,15 +199,7 @@ public class oConvertUtils {
return (getString(s, ""));
}
- /**
- * 转义成Unicode编码
- * @param s
- * @return
- */
- /*public static String escapeJava(Object s) {
- return StringEscapeUtils.escapeJava(getString(s));
- }*/
-
+
public static String getString(Object object) {
if (isEmpty(object)) {
return "";
@@ -263,7 +255,7 @@ public class oConvertUtils {
/**
* 判断一个类是否为基本数据类型。
- *
+ *
* @param clazz
* 要判断的类。
* @return true 表示为基本数据类型。
@@ -326,7 +318,7 @@ public class oConvertUtils {
/**
* java去除字符串中的空格、回车、换行符、制表符
- *
+ *
* @param str
* @return
*/
@@ -343,7 +335,7 @@ public class oConvertUtils {
/**
* 判断元素是否在数组内
- *
+ *
* @param substring
* @param source
* @return
@@ -370,8 +362,8 @@ public class oConvertUtils {
/**
* SET转换MAP
- *
- * @param str
+ *
+ * @param setobj
* @return
*/
public static Map