Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Improve]Trivial improvements #3723

Merged
merged 3 commits into from
May 27, 2024
Merged

[Improve]Trivial improvements #3723

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55e855f
[Improve]Trivial improvements
smallyao May 24, 2024
27449c3
Merge branch 'apache:dev' into dev
smallyao May 27, 2024
05105b2
Code optimization
smallyao May 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion streampark-common/src/main/scala/org/apache/streampark/common/util/Utils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,14 @@ object Utils extends Logger {

def getJarManifest(jarFile: File): jar.Manifest = {
smallyao marked this conversation as resolved.
Show resolved Hide resolved
requireCheckJarFile(jarFile.toURL)
new JarInputStream(new BufferedInputStream(new FileInputStream(jarFile))).getManifest
var jarInputStream: JarInputStream = null;
try {
jarInputStream = new JarInputStream(new BufferedInputStream(new FileInputStream(jarFile)))
jarInputStream.getManifest
} finally {
if (jarInputStream != null)
jarInputStream.close
}
}

def getJarManClass(jarFile: File): String = {
Expand Down
3 changes: 2 additions & 1 deletion ...ce/src/main/java/org/apache/streampark/console/core/service/impl/ResourceServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,8 @@ private RestResponse checkFlinkApp(Resource resourceParam) {
// get jarFile error
return buildExceptResponse(e, 1);
}
ApiAlertException.throwIfTrue(jarFile == null, "flink app jar must exist.");
ApiAlertException.throwIfTrue(
jarFile == null || !jarFile.exists(), "flink app jar must exist.");
Map<String, Serializable> resp = new HashMap<>(0);
resp.put(STATE, 0);
if (jarFile.getName().endsWith(Constant.PYTHON_SUFFIX)) {
Expand Down
4 changes: 2 additions & 2 deletions streampark-console/streampark-console-webapp/src/locales/lang/en/layout.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default {
version: 'Version',
// user dropdown
dropdownItemDoc: 'Document',
ChangePassword: 'ChangePassword',
ChangePassword: 'Change Password',
dropdownItemLoginOut: 'Login Out',

tooltipErrorLog: 'Error log',
Expand Down Expand Up @@ -105,7 +105,7 @@ export default {
tabDetail: 'Tab Detail',
tabsQuickBtn: 'Tabs quick button',
tabsRedoBtn: 'Tabs redo button',
tabsFoldBtn: 'Tabs flod button',
tabsFoldBtn: 'Tabs fold button',
sidebar: 'Sidebar',
header: 'Header',
footer: 'Footer',
Expand Down
Loading