Merge branch 'dev' into remove-statement

# Conflicts: # dinky-admin/src/main/java/org/dinky/controller/TaskController.java # dinky-admin/src/main/java/org/dinky/service/impl/TaskServiceImpl.java
gaoyan1998 · Oct 11, 2023 · eb6803f · eb6803f
2 parents 75acf7b + 96576a9
commit eb6803f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/dinky-common/src/main/java/org/dinky/utils/I18n.java b/dinky-common/src/main/java/org/dinky/utils/I18n.java
@@ -34,7 +34,10 @@ public final class I18n {
     private static final Logger logger = LoggerFactory.getLogger(I18n.class);
 
     private static final String MESSAGES_BASE = "i18n.messages";
-    private static ResourceBundle bundle;
+
+    static {
+        Locale.setDefault(Locale.US);
+    }
 
     private I18n() {}
 
@@ -52,7 +55,7 @@ public static void setLocale(Locale l) {
     }
 
     public static String getMessage(String key) {
-        bundle = ResourceBundle.getBundle(MESSAGES_BASE);
+        ResourceBundle bundle = ResourceBundle.getBundle(MESSAGES_BASE);
         String message = bundle.getString(key);
         if (!JDK_ABOVE_1_8) {
             message = new String(message.getBytes(StandardCharsets.ISO_8859_1), StandardCharsets.UTF_8);

diff --git a/dinky-web/src/pages/AuthCenter/Token/component/TokenModalForm/index.tsx b/dinky-web/src/pages/AuthCenter/Token/component/TokenModalForm/index.tsx
@@ -150,7 +150,6 @@ const TokenModalForm: React.FC<TokenModalFormProps & connect> = (props) => {
     form.setFieldValue('tokenValue', tokenValue);
   };
 
-
   return (
     <>
       <ModalForm<SysToken>
@@ -165,7 +164,7 @@ const TokenModalForm: React.FC<TokenModalFormProps & connect> = (props) => {
         initialValues={{ ...value }}
         modalProps={{
           destroyOnClose: true,
-          onCancel: () => handleCancel(),
+          onCancel: () => handleCancel()
         }}
       >
         <TokenForm expireType={expireType} buildToken={handleBuildToken} />

diff --git a/dinky-web/src/pages/DataStudio/index.tsx b/dinky-web/src/pages/DataStudio/index.tsx
@@ -183,6 +183,7 @@ const DataStudio = (props: any) => {
         console.log('changed', key, info[key], params.taskData[key]);
         return true;
       }
+      return false;
     });
 
     if (changed) {

diff --git a/dinky-web/src/pages/RegCenter/Alert/AlertGroup/components/AlertGroupForm/index.tsx b/dinky-web/src/pages/RegCenter/Alert/AlertGroup/components/AlertGroupForm/index.tsx
@@ -149,7 +149,7 @@ const AlertGroupForm: React.FC<AlertGroupFormProps> = (props) => {
       submitter={{ render: () => [...renderFooter()] }}
       modalProps={{
         destroyOnClose: true,
-        onCancel: () => handleModalVisible(false),
+        onCancel: () => handleModalVisible(false)
       }}
     >
       {renderAlertGroupForm()}

diff --git a/dinky-web/src/pages/RegCenter/GitProject/components/ProjectModal/index.tsx b/dinky-web/src/pages/RegCenter/GitProject/components/ProjectModal/index.tsx
@@ -111,7 +111,7 @@ const ProjectModal: React.FC<ProjectModalProps> = (props) => {
         initialValues={values}
         modalProps={{
           destroyOnClose: true,
-          onCancel: () => handleCancel(),
+          onCancel: () => handleCancel()
         }}
       >
         <ProjectForm values={values} form={form} />