diff options
8 files changed, 68 insertions, 6 deletions
diff --git a/distribution/src/main/assembly/Dockerfile b/distribution/src/main/assembly/Dockerfile index 1c86b4c4..925ef59f 100644 --- a/distribution/src/main/assembly/Dockerfile +++ b/distribution/src/main/assembly/Dockerfile @@ -20,4 +20,7 @@ WORKDIR /home/uui ADD usecase-ui-*-linux64.tar.gz /home/uui/ RUN chmod 755 /home/uui/*.sh +RUN bash /home/uui/configEnv.sh +USER uui +WORKDIR /home/uui ENTRYPOINT /home/uui/startup.sh diff --git a/distribution/src/main/assembly/configEnv.sh b/distribution/src/main/assembly/configEnv.sh new file mode 100644 index 00000000..b36855b8 --- /dev/null +++ b/distribution/src/main/assembly/configEnv.sh @@ -0,0 +1,31 @@ +#!/bin/bash +# +# Copyright 2020 CMCC Corporation. +# +# 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. +# + +main_path="/home/uui" + +add_user() { + useradd uui + echo "add_user uui..." +} + +modify_owner() { + chown -R uui:uui $main_path + echo "modify files owner..." +} + +add_user +modify_owner
\ No newline at end of file diff --git a/distribution/src/main/assembly/server.xml b/distribution/src/main/assembly/server.xml index 329a5be6..69683fb3 100644 --- a/distribution/src/main/assembly/server.xml +++ b/distribution/src/main/assembly/server.xml @@ -71,7 +71,7 @@ connectionTimeout="20000"
redirectPort="8443" />
-->
-<Connector port="8080" protocol="org.apache.coyote.http11.Http11NioProtocol"
+<Connector port="8443" protocol="org.apache.coyote.http11.Http11NioProtocol"
maxThreads="150" SSLEnabled="true" scheme="https" secure="true"
clientAuth="false" sslProtocol="TLS" keystoreFile="conf/uuiServer.jks" keystorePass="Aa123456" />
@@ -119,7 +119,7 @@ -->
<!-- Define an AJP 1.3 Connector on port 8009 -->
- <Connector port="8009" protocol="AJP/1.3" redirectPort="8080" />
+ <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
<!-- An Engine represents the entry point (within Catalina) that processes
diff --git a/distribution/src/main/assembly/uuiStartup.sh b/distribution/src/main/assembly/uuiStartup.sh new file mode 100644 index 00000000..b318b3da --- /dev/null +++ b/distribution/src/main/assembly/uuiStartup.sh @@ -0,0 +1,28 @@ +# +# Copyright 2020 CMCC Corporation. +# +# 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. +# + +echo "### Starting usecase-ui" + +cp -f /home/uui/server.xml /home/uui/tomcat/conf/ +echo "cp server.xml" + +cp -f /home/uui/web.xml /home/uui/tomcat/conf/ +echo "cp web.xml" + +cp -f /home/uui/uuiServer.jks /home/uui/tomcat/conf/ +echo "cp uuiServer.jks" + +bash /home/uui/tomcat/bin/catalina.sh run
\ No newline at end of file diff --git a/usecaseui-portal/src/app/views/services/sotn-management/manage-service/manage-service.component.html b/usecaseui-portal/src/app/views/services/sotn-management/manage-service/manage-service.component.html index 3ed0bf51..167d3d95 100644 --- a/usecaseui-portal/src/app/views/services/sotn-management/manage-service/manage-service.component.html +++ b/usecaseui-portal/src/app/views/services/sotn-management/manage-service/manage-service.component.html @@ -16,7 +16,7 @@ <nz-form-label class="colm-s-1 lblCls" [nzSm]="6" [nzXs]="24" nzRequired nzFor="capacity">{{"i18nTextDefine_serviceInstance" | translate}}</nz-form-label> </td> <td> - <nz-select class="colm-s-2" id="serviceInstance" [(ngModel)]="selectedServiceInstance" (ngModelChange)="getSubscribedSites($event)" nzAllowClear + <nz-select class="colm-s-2" id="serviceInstance" [(ngModel)]="selectedServiceInstance" (ngModelChange)="getSubscribedSites()" nzAllowClear nzPlaceHolder="Choose"> <nz-option *ngFor="let option of serviceInstanceList" [nzValue]="option.serviceInstance" [nzLabel]="option.serviceInstancename"></nz-option> </nz-select> diff --git a/usecaseui-portal/src/app/views/services/sotn-management/monitor-service/monitor-service.component.html b/usecaseui-portal/src/app/views/services/sotn-management/monitor-service/monitor-service.component.html index 9dee4526..39bfa1bf 100644 --- a/usecaseui-portal/src/app/views/services/sotn-management/monitor-service/monitor-service.component.html +++ b/usecaseui-portal/src/app/views/services/sotn-management/monitor-service/monitor-service.component.html @@ -17,7 +17,7 @@ <nz-form-label class ="colm-s-1 lblCls" [nzSm]="6" [nzXs]="24" nzRequired nzFor="capacity">{{"i18nTextDefine_serviceInstance" | translate}}</nz-form-label> </td> <td> - <nz-select id="serviceInstance" class= "colm-s-2 " [(ngModel)]="selectedServiceInstance" (ngModelChange)="getSelectedsubscriptionInfo($event)" + <nz-select id="serviceInstance" class= "colm-s-2 " [(ngModel)]="selectedServiceInstance" (ngModelChange)="getSelectedsubscriptionInfo()" nzAllowClear nzPlaceHolder="Choose"> <nz-option *ngFor="let option of serviceInstanceList" [nzValue]="option.serviceInstance" [nzLabel]="option.serviceInstancename"></nz-option> </nz-select> diff --git a/usecaseui-portal/src/app/views/services/sotn-management/monitor-service/monitor-service.component.ts b/usecaseui-portal/src/app/views/services/sotn-management/monitor-service/monitor-service.component.ts index 9a427f2c..c4f2760f 100644 --- a/usecaseui-portal/src/app/views/services/sotn-management/monitor-service/monitor-service.component.ts +++ b/usecaseui-portal/src/app/views/services/sotn-management/monitor-service/monitor-service.component.ts @@ -304,7 +304,7 @@ export class MonitorServiceComponent implements OnInit { } } // Getting sitedata Based On Type and ID - getSelectedsubscriptionInfo(s) { + getSelectedsubscriptionInfo() { this.getData(); this.refreshData(); if (this.intervalData) { diff --git a/usecaseui-portal/src/app/views/services/sotn-management/order-service/order-service.component.html b/usecaseui-portal/src/app/views/services/sotn-management/order-service/order-service.component.html index a89ef1af..fc08133c 100644 --- a/usecaseui-portal/src/app/views/services/sotn-management/order-service/order-service.component.html +++ b/usecaseui-portal/src/app/views/services/sotn-management/order-service/order-service.component.html @@ -170,7 +170,7 @@ <div class="sotn-form" style="width:10%"> <nz-form-item class="mar-0x"> <nz-form-control [nzSm]="14" [nzXs]="24"> - <button (click)="addUNI($event)" nz-button nzType="primary">{{ "i18nTextDefine_Add" | translate }}</button> + <button (click)="addUNI()" nz-button nzType="primary">{{ "i18nTextDefine_Add" | translate }}</button> </nz-form-control> </nz-form-item> </div> |