diff --git a/.gitignore b/.gitignore index 2da51cbfed53fd6fe61133ff40efe8623084dd74..c0b5c1fe63bd6e8fecc42b9c946b841c1c89cb17 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,11 @@ setEnvVars.bat /.gradle/ /.gradle/* .vscode/settings.json + +maxkey-web-frontend/maxkey-web-mgt-app/node_modules/ +maxkey-web-frontend/maxkey-web-mgt-app/.angular +maxkey-web-frontend/maxkey-web-mgt-app/yarn.lock + +maxkey-web-frontend/maxkey-web-app/node_modules/ +maxkey-web-frontend/maxkey-web-app/.angular/ +maxkey-web-frontend/maxkey-web-app/yarn.lock \ No newline at end of file diff --git a/build.gradle b/build.gradle index 30d7681b6fad9c1624726e8ed236507afc476f4f..4bdcfc0da64c284f06764bef52f32053ba132f65 100644 --- a/build.gradle +++ b/build.gradle @@ -78,12 +78,12 @@ allprojects { compileJava.options.encoding = 'UTF-8' eclipse { - /* 第一次时请注释这段eclipse设置,可能报错,设置工程字符集 + /* 第一次时请注释这段eclipse设置,可能报错,设置工程字符集*/ jdt { File f = file('.settings/org.eclipse.core.resources.prefs') f.write('eclipse.preferences.version=1\n') f.append('encoding/=UTF-8') //use UTF-8 - }*/ + } }