Update default config

Author: VancySavoki

moss-ui/src/pages/.umi/LocaleWrapper.jsx

@@ -19,10 +19,15 @@ let appLocale = {
   data: require('react-intl/locale-data/zh'),
   momentLocale: 'zh-cn',
 };
+
+const runtimeLocale = window.g_plugins.mergeConfig('locale') || {};
+const runtimeLocaleDefault =  typeof runtimeLocale.default === 'function' ? runtimeLocale.default() : runtimeLocale.default;
 if (useLocalStorage && localStorage.getItem('umi_locale') && localeInfo[localStorage.getItem('umi_locale')]) {
   appLocale = localeInfo[localStorage.getItem('umi_locale')];
 } else if (localeInfo[navigator.language] && baseNavigator){
   appLocale = localeInfo[navigator.language];
+} else if(localeInfo[runtimeLocaleDefault]){
+  appLocale = localeInfo[runtimeLocaleDefault];
 } else {
   appLocale = localeInfo['zh-CN'] || appLocale;
 }

moss-ui/src/pages/.umi/umi.js

@@ -1,14 +1,19 @@
 import './polyfills';
+<<<<<<< HEAD
 import '../../global.ts';
 import '@tmp/initHistory';
+=======
+import '@tmp/initHistory';
+import '../../global.ts';
+>>>>>>> 91b037d... Update default config
 import React from 'react';
 import ReactDOM from 'react-dom';
 
 
 // runtime plugins
 window.g_plugins = require('umi/_runtimePlugin');
 window.g_plugins.init({
-  validKeys: ['patchRoutes','render','rootContainer','modifyRouteProps','onRouteChange',],
+  validKeys: ['patchRoutes','render','rootContainer','modifyRouteProps','onRouteChange','locale',],
 });
 window.g_plugins.use(require('@/app'));
 

moss-web/src/main/resources/config/application-mysql.yml

@@ -17,4 +17,12 @@ spring:
     testOnBorrow: false
     testOnReturn: false
     poolPreparedStatements: true
+<<<<<<< HEAD
     maxOpenPreparedStatements: 20
+=======
+<<<<<<< HEAD
+    maxOpenPreparedStatements: 20
+=======
+    maxOpenPreparedStatements: 20
+>>>>>>> Update default config
+>>>>>>> 91b037d... Update default config

moss-web/src/main/resources/config/application.yml

@@ -44,6 +44,7 @@ moss.skywalking.url: http://localhost:8083/
 logging:
   moss:
     path: logs
+<<<<<<< HEAD
   registry:
     files:
     - name: info
@@ -53,4 +54,6 @@ logging:
       description: 标准输出
       path: logs/${spring.application.name}/error.log
     - name: gclog
-      path: logs/${spring.application.name}/gc.log
+      path: logs/${spring.application.name}/gc.log
+=======
+>>>>>>> 91b037d... Update default config