zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve conflict

Browse Source
This commit is contained in:
zhichen 2018-12-14 20:24:04 +08:00
commit a95f623f33
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
console/src/main/resources/static/console-fe/src/utils/validateContent.js
View File

@ -49,11 +49,11 @@ export default {
* 检测属性是否正确
*/
validateProperties(str = '') {
let reg = /^[A-Za-z\d-_]+=.+$/;
const reg = /^[^=]+=[^=]+$/;
return str
.replace('\n\r', '\n')
.split('\n')
.every(_str => reg.test(_str));
.every(_str => reg.test(_str.trim()));
},
/**

2
console/src/main/resources/static/js/main.js
View File

File diff suppressed because one or more lines are too long

4
pom.xml
View File

@ -241,8 +241,8 @@
<exclude>src/test/resources/*</exclude>
<exclude>src/main/resources/static/**/*.js</exclude>
<exclude>src/main/resources/**/*.svg</exclude>
<exclude>src/main/resources/static/css/console1412.css</exclude>
<exclude>src/main/resources/static/js/vs/**/*</exclude>
<exclude>src/main/resources/static/css/*</exclude>
<exclude>src/main/resources/static/js/*</exclude>
<exclude>src/main/resources/static/console-fe/public/css/console1412.css</exclude>
<exclude>src/main/resources/static/console-fe/public/js/vs/editor/editor.main.css</exclude>
<exclude>src/main/resources/static/console-fe/dist/js/vs/editor/editor.main.css</exclude>