Commit f9b2aa6b authored by Jason Song's avatar Jason Song

fix the issue that access key function doesn't work when prefix path is configured

parent ffc33fb8
...@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
public class PrefixPathController { public class PrefixPathController {
@Value("${prefixPath:}") @Value("${prefix.path:}")
private String prefixPath; private String prefixPath;
@GetMapping("/prefix-path") @GetMapping("/prefix-path")
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</div> </div>
<div class="col-md-5 text-right"> <div class="col-md-5 text-right">
<a type="button" class="btn btn-info" data-dismiss="modal" <a type="button" class="btn btn-info" data-dismiss="modal"
href="/config.html?#appid={{pageContext.appId}}">{{'Common.ReturnToIndex' | translate }} href="{{ '/config.html' | prefixPath }}?#appid={{pageContext.appId}}">{{'Common.ReturnToIndex' | translate }}
</a> </a>
</div> </div>
</div> </div>
......
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
<apolloentrance apollo-title="'Config.AccessKeyManage' | translate" <apolloentrance apollo-title="'Config.AccessKeyManage' | translate"
apollo-img-src="'accesskey-manage'" apollo-img-src="'accesskey-manage'"
apollo-href="'/app/access_key.html?#/appid=' + pageContext.appId"></apolloentrance> apollo-href="'app/access_key.html?#/appid=' + pageContext.appId"></apolloentrance>
<a class="list-group-item" ng-show="missEnvs.length > 0" ng-click="createAppInMissEnv()"> <a class="list-group-item" ng-show="missEnvs.length > 0" ng-click="createAppInMissEnv()">
<div class="row icon-text icon-plus-orange"> <div class="row icon-text icon-plus-orange">
......
appService.service('AccessKeyService', ['$resource', '$q', function ($resource, $q) { appService.service('AccessKeyService', ['$resource', '$q', 'AppUtil', function ($resource, $q, AppUtil) {
var access_key_resource = $resource('', {}, { var access_key_resource = $resource('', {}, {
load_access_keys: { load_access_keys: {
method: 'GET', method: 'GET',
isArray: true, isArray: true,
url: '/apps/:appId/envs/:env/accesskeys' url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/accesskeys'
}, },
create_access_key: { create_access_key: {
method: 'POST', method: 'POST',
url: '/apps/:appId/envs/:env/accesskeys' url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/accesskeys'
}, },
remove_access_key: { remove_access_key: {
method: 'DELETE', method: 'DELETE',
url: '/apps/:appId/envs/:env/accesskeys/:id' url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/accesskeys/:id'
}, },
enable_access_key: { enable_access_key: {
method: 'PUT', method: 'PUT',
url: '/apps/:appId/envs/:env/accesskeys/:id/enable' url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/accesskeys/:id/enable'
}, },
disable_access_key: { disable_access_key: {
method: 'PUT', method: 'PUT',
url: '/apps/:appId/envs/:env/accesskeys/:id/disable' url: AppUtil.prefixPath() + '/apps/:appId/envs/:env/accesskeys/:id/disable'
} }
}); });
return { return {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment