Merge pull request #40 from SpringCloud/develop

Develop

Author: SoftwareKing

.gitignore

@@ -17,6 +17,7 @@ target
 *.ipr
 
 moss-ui/node_modules/
+logs
 
 ### BUILD ###
 nbproject/private/
@@ -30,3 +31,22 @@ out/
 /*/target
 target
 
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+moss-ui/node_modules
+moss-ui/npm-debug.log*
+moss-ui/yarn-error.log
+moss-uiyarn.lock
+moss-ui/package-lock.json
+
+# production
+moss-ui/dist
+dist.zip
+
+# misc
+.DS_Store
+
+# umi
+.umi
+.umi-production

README.md

@@ -74,6 +74,7 @@ Roadmap 时间点：
 |    SoftwareKing  | Owner | https://github.com/SoftwareKing|
 |   iShawnWang  | 前端开发 | https://github.com/iShawnWang |
 | homeant | 前后台开发 | https://github.com/homeant |
+| VancySavoki | 后端开发 | https://github.com/VancySavoki |
 
 ### 1.3 Moss的功能
 

moss-adapter/moss-adapter-multi-eureka/src/main/java/de/codecentric/boot/admin/server/cloud/extension/MossInstanceDiscoveryListener.java

@@ -79,10 +79,13 @@ public void onApplicationReady(ApplicationReadyEvent event) {
 
     @EventListener
     public void onInstanceRegistered(InstanceRegisteredEvent<?> event) {
-        MossEurekaAutoServiceRegistration eurekaAutoServiceRegistration = (MossEurekaAutoServiceRegistration) event.getSource();
-        cloudEurekaClient.set(eurekaAutoServiceRegistration.getRegistration().getEurekaClient());
-        discover();
-        cloudEurekaClient.remove();
+        Object source = event.getSource();
+        if(source instanceof MossEurekaAutoServiceRegistration) {
+            MossEurekaAutoServiceRegistration eurekaAutoServiceRegistration = (MossEurekaAutoServiceRegistration)source ;
+            cloudEurekaClient.set(eurekaAutoServiceRegistration.getRegistration().getEurekaClient());
+            discover();
+            cloudEurekaClient.remove();
+        }
     }
 
     @EventListener

moss-adapter/pom.xml

@@ -13,7 +13,7 @@
     <version>1.0.0.RELEASE</version>
     <packaging>pom</packaging>
     <modules>
-        <!--<module>moss-adapter-single-eureka</module>-->
+        <module>moss-adapter-single-eureka</module>
         <module>moss-adapter-single-nacos</module>
         <module>moss-adapter-multi-eureka</module>
         <module>moss-adapter-multi-zookeeper</module>

moss-client/moss-client-1.x/src/main/resources/META-INF/moss-client/bootstrap.properties

@@ -1,5 +1,6 @@
 spring.cloud.zookeeper.discovery.root=/moss-client
 management.info.git.mode=full
+management.port=8081
 management.context-path=/actuator
 management.security.enabled=false
 endpoints.actuator.enabled=true
@@ -13,4 +14,4 @@ endpoints.pause.enabled=false
 endpoints.resume.enabled=false
 endpoints.refresh.enabled=false
 endpoints.sensitive=false
-endpoints.hypermedia.enabled=true
+endpoints.hypermedia.enabled=true

moss-client/moss-client-2.x/src/main/resources/META-INF/moss-client/bootstrap.properties

@@ -1,4 +1,5 @@
 spring.cloud.zookeeper.discovery.root=/moss-client
+management.server.port=8081
 management.endpoints.web.exposure.include=*
 management.endpoints.web.exposure.exclude[0]=pause
 management.endpoints.web.exposure.exclude[1]=refresh

moss-ui/README.md

@@ -18,6 +18,13 @@ UI : [React](https://reactjs.org/) [Less](http://lesscss.org/) [Ant design](http
 
 # Getting Started
 
+本地开发  
+`npm run start`
+
+自动打包  
+`npm run build`
+
+提示命令行
 `npm run 6`
 
 # 相关

moss-ui/src/models/application/service.ts

@@ -187,7 +187,7 @@ const application = {
   ) => {
     const requestConf: any = {
       method: 'get',
-      responseType: 'Arraybuffer',
+      responseType: 'buffer',
       url: `admin/instances/${id}/actuator/logfile/${value}`,
     }
 

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'));