diff options
Diffstat (limited to 'msb-core/apiroute/apiroute-standalone/src')
12 files changed, 300 insertions, 205 deletions
diff --git a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/apirouteService.xml b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/apirouteService.xml index f885a95..ab92b2f 100644 --- a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/apirouteService.xml +++ b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/apirouteService.xml @@ -1,13 +1,33 @@ -<service>
- <id>msb_apiroute</id>
- <name>msb_apiroute</name>
- <description>This service runs apiroute.</description>
- <workingdirectory>%BASE%</workingdirectory>
- <env name="JAVA_HOME" value="c:\jdk"/>
- <env name="RUNHOME" value="%BASE%"/>
- <executable>java</executable>
- <arguments>-jar "apiroute-service.jar" server "conf/apiroute.yml"</arguments>
- <stopexecutable>stop.bat</stopexecutable>
- <logmode>rotate</logmode>
- <!-- stopparentprocessfirst>true</stopparentprocessfirst -->
+<!-- + + Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + Author: Zhaoxing Meng + email: meng.zhaoxing1@zte.com.cn + +--> +<service> + <id>msb_apiroute</id> + <name>msb_apiroute</name> + <description>This service runs apiroute.</description> + <workingdirectory>%BASE%</workingdirectory> + <env name="JAVA_HOME" value="c:\jdk"/> + <env name="RUNHOME" value="%BASE%"/> + <executable>java</executable> + <arguments>-jar "apiroute-service.jar" server "conf/apiroute.yml"</arguments> + <stopexecutable>stop.bat</stopexecutable> + <logmode>rotate</logmode> + <!-- stopparentprocessfirst>true</stopparentprocessfirst --> </service>
\ No newline at end of file diff --git a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/conf/apiroute.yml b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/conf/apiroute.yml index 172fae3..4fe697d 100644 --- a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/conf/apiroute.yml +++ b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/conf/apiroute.yml @@ -1,52 +1,71 @@ -defaultWorkspace: ../apiroute-works
-
-defaultName: ${DW_DEFAULT_NAME:-Stranger}
-
-propertiesName: redis.properties
-propertiesDir: conf
-
-# use the discover config if you want to monitor a discover service and register microservices change
-discoverInfo:
- ip: 127.0.0.1
- port: 10081
- enabled: false
-
-consulInfo:
- ip: 127.0.0.1
- port: 8500
-
-# use the simple server factory if you only want to run on a single port
-server:
- type: simple
- rootPath: '/api/microservices/v1/*'
- applicationContextPath: /
- adminContextPath: /admin
- connector:
- type: http
- port: 8086
-
-# Logging settings.
-logging:
-
- # The default level of all loggers. Can be OFF, ERROR, WARN, INFO, DEBUG, TRACE, or ALL.
- level: ALL
-
- # Logger-specific levels.
- loggers:
-
- # Sets the level for 'com.example.app' to DEBUG.
- com.example: DEBUG
-
- appenders:
- - type: console
- threshold: INFO
- timeZone: UTC
- logFormat: "%-6level [%d{HH:mm:ss.SSS}] [%t] %logger{5} - %X{code} %msg %n"
- - type: file
- threshold: INFO
- logFormat: "%-6level [%d{HH:mm:ss.SSS}] [%t] %logger{5} - %X{code} %msg %n"
- currentLogFilename: ../apiroute-works/logs/application.log
- archivedLogFilenamePattern: ../apiroute-works/logs/application-%d{yyyy-MM-dd}-%i.log.gz
- archivedFileCount: 7
- timeZone: UTC
-
+# +# Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Author: Zhaoxing Meng +# email: meng.zhaoxing1@zte.com.cn +# + +defaultWorkspace: ../apiroute-works + +defaultName: ${DW_DEFAULT_NAME:-Stranger} + +propertiesName: redis.properties +propertiesDir: conf + +# use the discover config if you want to monitor a discover service and register microservices change +discoverInfo: + ip: 127.0.0.1 + port: 10081 + enabled: false + +consulInfo: + ip: 127.0.0.1 + port: 8500 + +# use the simple server factory if you only want to run on a single port +server: + type: simple + rootPath: '/api/microservices/v1/*' + applicationContextPath: / + adminContextPath: /admin + connector: + type: http + port: 8086 + +# Logging settings. +logging: + + # The default level of all loggers. Can be OFF, ERROR, WARN, INFO, DEBUG, TRACE, or ALL. + level: ALL + + # Logger-specific levels. + loggers: + + # Sets the level for 'com.example.app' to DEBUG. + com.example: DEBUG + + appenders: + - type: console + threshold: INFO + timeZone: UTC + logFormat: "%-6level [%d{HH:mm:ss.SSS}] [%t] %logger{5} - %X{code} %msg %n" + - type: file + threshold: INFO + logFormat: "%-6level [%d{HH:mm:ss.SSS}] [%t] %logger{5} - %X{code} %msg %n" + currentLogFilename: ../apiroute-works/logs/application.log + archivedLogFilenamePattern: ../apiroute-works/logs/application-%d{yyyy-MM-dd}-%i.log.gz + archivedFileCount: 7 + timeZone: UTC + diff --git a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/ext/initServices/msb.json b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/ext/initServices/msb.json index e493556..7c0ec0d 100644 --- a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/ext/initServices/msb.json +++ b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/ext/initServices/msb.json @@ -1,29 +1,29 @@ -[{
- "serviceName" : "microservices",
- "version" : "v1",
- "url" : "/api/microservices/v1",
- "apiJson" : "/api/microservices/v1/swagger.json",
- "apiJsonType" : "1",
- "metricsUrl" : "/admin/metrics",
- "control" : "1",
- "status" : "1",
- "servers" : [{
- "ip" : "127.0.0.1",
- "port" : "8086",
- "weight" : 0
- }
- ]
- },
-{
- "serviceName" : "microservices",
- "url" : "/iui/microservices",
- "control" : "1",
- "status" : "1",
- "servers" : [{
- "ip" : "127.0.0.1",
- "port" : "8086",
- "weight" : 0
- }
- ]
- }
-]
+[{ + "serviceName" : "microservices", + "version" : "v1", + "url" : "/api/microservices/v1", + "apiJson" : "/api/microservices/v1/swagger.json", + "apiJsonType" : "1", + "metricsUrl" : "/admin/metrics", + "control" : "1", + "status" : "1", + "servers" : [{ + "ip" : "127.0.0.1", + "port" : "8086", + "weight" : 0 + } + ] + }, +{ + "serviceName" : "microservices", + "url" : "/iui/microservices", + "control" : "1", + "status" : "1", + "servers" : [{ + "ip" : "127.0.0.1", + "port" : "8086", + "weight" : 0 + } + ] + } +] diff --git a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/ext/initServices/readme.txt b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/ext/initServices/readme.txt index 59ef5e4..2df5d10 100644 --- a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/ext/initServices/readme.txt +++ b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/ext/initServices/readme.txt @@ -1,63 +1,82 @@ -########################## initialize default routeInfo to redis ##########################
-
-#when msb is starting, it will automatically read all json files under this folder, and initializes to redis.
-#If the routeInfo is exist, it will be ignored, otherwise it will be saved.
-
-
-# JSON File content must be routeInfo format array like below examples:
-
-# optional:
-# apiJsonType: 1:user-defined json type 0:pre-defined json type
-# control: 0:default 1:readonly 2:hidden
-# status: 0:disabled 1:enabled
-# Tip£ºcontrol¡¢status¡¢weight are non-mandatory
-
-[
-##########################apiRoute example##########################
-
-{
- "serviceName" : "microservices",
- "version" : "v1",
- "url" : "/api/microservices/v1",
- "apiJson" : "/api/microservices/v1/swagger.json",
- "apiJsonType" : "1",
- "metricsUrl" : "/admin/metrics",
- "control" : "1",
- "status" : "1",
- "servers" : [{
- "ip" : "127.0.0.1",
- "port" : "8086",
- "weight" : 0
- }
- ]
- },
-
-##########################iuiRoute example##########################
-
-{
- "serviceName" : "microservices",
- "url" : "/iui/microservices",
- "control" : "1",
- "status" : "1",
- "servers" : [{
- "ip" : "127.0.0.1",
- "port" : "8086",
- "weight" : 0
- }
- ]
- },
-
-##########################customRoute example##########################
- {
- "serviceName" : "/test",
- "url" : "/test",
- "control" : "0",
- "status" : "1",
- "servers" : [{
- "ip" : "10.74.56.36",
- "port" : "8989",
- "weight" : 0
- }
- ]
- }
+==== + Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + Author: Zhaoxing Meng + email: meng.zhaoxing1@zte.com.cn +==== + +########################## initialize default routeInfo to redis ########################## + +#when msb is starting, it will automatically read all json files under this folder, and initializes to redis. +#If the routeInfo is exist, it will be ignored, otherwise it will be saved. + + +# JSON File content must be routeInfo format array like below examples: + +# optional: +# apiJsonType: 1:user-defined json type 0:pre-defined json type +# control: 0:default 1:readonly 2:hidden +# status: 0:disabled 1:enabled +# Tip��control��status��weight are non-mandatory + +[ +##########################apiRoute example########################## + +{ + "serviceName" : "microservices", + "version" : "v1", + "url" : "/api/microservices/v1", + "apiJson" : "/api/microservices/v1/swagger.json", + "apiJsonType" : "1", + "metricsUrl" : "/admin/metrics", + "control" : "1", + "status" : "1", + "servers" : [{ + "ip" : "127.0.0.1", + "port" : "8086", + "weight" : 0 + } + ] + }, + +##########################iuiRoute example########################## + +{ + "serviceName" : "microservices", + "url" : "/iui/microservices", + "control" : "1", + "status" : "1", + "servers" : [{ + "ip" : "127.0.0.1", + "port" : "8086", + "weight" : 0 + } + ] + }, + +##########################customRoute example########################## + { + "serviceName" : "/test", + "url" : "/test", + "control" : "0", + "status" : "1", + "servers" : [{ + "ip" : "10.74.56.36", + "port" : "8989", + "weight" : 0 + } + ] + } ]
\ No newline at end of file diff --git a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/ext/initUrlRootPath/initUrlRootPath.json b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/ext/initUrlRootPath/initUrlRootPath.json index 9668592..8684dee 100644 --- a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/ext/initUrlRootPath/initUrlRootPath.json +++ b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/ext/initUrlRootPath/initUrlRootPath.json @@ -1,4 +1,4 @@ -{
- "iuiRootPath" : "iui",
- "apiRootPath" : "api"
-}
+{ + "iuiRootPath" : "openoui", + "apiRootPath" : "openoapi" +} diff --git a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/ext/initVisualRange/initVisualRangeMatches.json b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/ext/initVisualRange/initVisualRangeMatches.json index 82ff10d..4554783 100644 --- a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/ext/initVisualRange/initVisualRangeMatches.json +++ b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/ext/initVisualRange/initVisualRangeMatches.json @@ -1,3 +1,3 @@ -{
- "visualRange" : "0,1"
-}
+{ + "visualRange" : "0,1" +} diff --git a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/ext/initVisualRange/readme.txt b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/ext/initVisualRange/readme.txt index 2fe9f72..36e9244 100644 --- a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/ext/initVisualRange/readme.txt +++ b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/ext/initVisualRange/readme.txt @@ -1,14 +1,33 @@ -########################## initialize default visualRange Matches from msdiscover to redis ##########################
-
-
-visualRange:·þÎñµÄ¿É¼û·¶Î§ ϵͳ¼ä:0 ϵͳÄÚ:1
-
-#when msb is starting, it will automatically read this json file named "initVisualRangeMatches.json"
-
-#when msdiscover will sysn datas to apiGateway,only visualRange Matches will be save to redis.
-
-
-
-# JSON File content must be format array like below examples:
-
+==== + Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + Author: Zhaoxing Meng + email: meng.zhaoxing1@zte.com.cn +==== + +########################## initialize default visualRange Matches from msdiscover to redis ########################## + + +visualRange:����Ŀɼ���Χ ϵͳ��:0 ϵͳ��:1 + +#when msb is starting, it will automatically read this json file named "initVisualRangeMatches.json" + +#when msdiscover will sysn datas to apiGateway,only visualRange Matches will be save to redis. + + + +# JSON File content must be format array like below examples: + 0 or 1 or 0,1
\ No newline at end of file diff --git a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/find_kill_process.bat b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/find_kill_process.bat index 1b3b76b..34e5823 100644 --- a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/find_kill_process.bat +++ b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/find_kill_process.bat @@ -1,23 +1,27 @@ -@REM
-@REM Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
-@REM
-@REM Licensed under the Apache License, Version 2.0 (the "License");
-@REM you may not use this file except in compliance with the License.
-@REM You may obtain a copy of the License at
-@REM
-@REM http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing, software
-@REM distributed under the License is distributed on an "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@REM See the License for the specific language governing permissions and
-@REM limitations under the License.
-@REM
-echo %1 | findstr %2 | findstr %3>NUL
-echo ERRORLEVEL=%ERRORLEVEL%
-IF ERRORLEVEL 1 goto findend
-for /f "tokens=1" %%a in (%1) do (
- echo kill %1
- taskkill /F /pid %%a
-)
+@REM +@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. +@REM +@REM Licensed under the Apache License, Version 2.0 (the "License"); +@REM you may not use this file except in compliance with the License. +@REM You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, software +@REM distributed under the License is distributed on an "AS IS" BASIS, +@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@REM See the License for the specific language governing permissions and +@REM limitations under the License. +@REM +@REM Author: Zhaoxing Meng +@REM email: meng.zhaoxing1@zte.com.cn +@REM + +echo %1 | findstr %2 | findstr %3>NUL +echo ERRORLEVEL=%ERRORLEVEL% +IF ERRORLEVEL 1 goto findend +for /f "tokens=1" %%a in (%1) do ( + echo kill %1 + taskkill /F /pid %%a +) :findend
\ No newline at end of file diff --git a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/run.bat b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/run.bat index 6e2362a..83a76cb 100644 --- a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/run.bat +++ b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/run.bat @@ -1,11 +1,11 @@ @REM -@REM Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE) +@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. @REM You may obtain a copy of the License at @REM -@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM http://www.apache.org/licenses/LICENSE-2.0 @REM @REM Unless required by applicable law or agreed to in writing, software @REM distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,10 @@ @REM See the License for the specific language governing permissions and @REM limitations under the License. @REM +@REM Author: Zhaoxing Meng +@REM email: meng.zhaoxing1@zte.com.cn +@REM + @echo off title apiroute-service diff --git a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/run.sh b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/run.sh index bd62668..7201c05 100644 --- a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/run.sh +++ b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/run.sh @@ -1,12 +1,12 @@ #!/bin/bash # -# Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE) +# Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -14,6 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# Author: Zhaoxing Meng +# email: meng.zhaoxing1@zte.com.cn +# #JAVA_HOME="/home/conductortest/jdk1.7/jdk/linux" diff --git a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/stop.bat b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/stop.bat index 96e96a8..e37210a 100644 --- a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/stop.bat +++ b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/stop.bat @@ -1,11 +1,11 @@ @REM -@REM Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE) +@REM Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. @REM @REM Licensed under the Apache License, Version 2.0 (the "License"); @REM you may not use this file except in compliance with the License. @REM You may obtain a copy of the License at @REM -@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM http://www.apache.org/licenses/LICENSE-2.0 @REM @REM Unless required by applicable law or agreed to in writing, software @REM distributed under the License is distributed on an "AS IS" BASIS, @@ -13,6 +13,10 @@ @REM See the License for the specific language governing permissions and @REM limitations under the License. @REM +@REM Author: Zhaoxing Meng +@REM email: meng.zhaoxing1@zte.com.cn +@REM + @echo off title stopping apiroute-service diff --git a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/stop.sh b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/stop.sh index 6d48003..9895070 100644 --- a/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/stop.sh +++ b/msb-core/apiroute/apiroute-standalone/src/assembly/resource/apiroute/stop.sh @@ -1,12 +1,12 @@ #!/bin/bash # -# Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE) +# Copyright 2016 2015-2016 ZTE, Inc. and others. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -14,6 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# Author: Zhaoxing Meng +# email: meng.zhaoxing1@zte.com.cn +# DIRNAME=`dirname $0` HOME=`cd $DIRNAME/; pwd` |