Skip to content

Commit

Permalink
bugfix
Browse files Browse the repository at this point in the history
  • Loading branch information
@lepdou
lepdou committed Jul 11, 2016
1 parent 0c515c2 commit 5395c80
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 27 deletions.
34 changes: 19 additions & 15 deletions apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/AppNamespaceService.java
View file
Expand Up @@ -31,6 +31,8 @@ public class AppNamespaceService {
private ClusterService clusterService;
@Autowired
private AuditService auditService;
@Autowired
private ServerConfigService serverConfigService;

public boolean isAppNamespaceNameUnique(String appId, String namespaceName) {
Objects.requireNonNull(appId, "AppId must not be null");
Expand Down Expand Up @@ -80,23 +82,12 @@ public AppNamespace createAppNamespace(AppNamespace appNamespace){
appNamespace.setDataChangeCreatedBy(createBy);
appNamespace.setDataChangeLastModifiedBy(createBy);
appNamespace = appNamespaceRepository.save(appNamespace);
//所有的cluster下面link新建的appnamespace
if (!appNamespace.isPublic()){
String appId = appNamespace.getAppId();
String namespaceName = appNamespace.getName();

List<Cluster> clusters = clusterService.findClusters(appId);
for (Cluster cluster: clusters){
Namespace namespace = new Namespace();
namespace.setClusterName(cluster.getName());
namespace.setAppId(appId);
namespace.setNamespaceName(namespaceName);
namespace.setDataChangeCreatedBy(createBy);
namespace.setDataChangeLastModifiedBy(createBy);
namespaceService.save(namespace);
}

//// TODO: 16/7/11 上线完删除开关逻辑
if ("true".equals(serverConfigService.getValue("appnamespace.private.enable", "false")) && !appNamespace.isPublic()) {
linkPrivateAppNamespaceInAllCluster(appNamespace.getAppId(), appNamespace.getName(), createBy);
}

auditService.audit(AppNamespace.class.getSimpleName(), appNamespace.getId(), Audit.OP.INSERT,
createBy);
return appNamespace;
Expand All @@ -111,4 +102,17 @@ public AppNamespace update(AppNamespace appNamespace){

return managedNs;
}

private void linkPrivateAppNamespaceInAllCluster(String appId, String namespaceName, String createBy) {
List<Cluster> clusters = clusterService.findClusters(appId);
for (Cluster cluster : clusters) {
Namespace namespace = new Namespace();
namespace.setClusterName(cluster.getName());
namespace.setAppId(appId);
namespace.setNamespaceName(namespaceName);
namespace.setDataChangeCreatedBy(createBy);
namespace.setDataChangeLastModifiedBy(createBy);
namespaceService.save(namespace);
}
}
}
4 changes: 4 additions & 0 deletions ...ortal/src/main/java/com/ctrip/framework/apollo/portal/controller/NamespaceController.java
View file
Expand Up @@ -15,6 +15,7 @@
import com.ctrip.framework.apollo.portal.service.AppNamespaceService;
import com.ctrip.framework.apollo.portal.service.AppService;
import com.ctrip.framework.apollo.portal.service.NamespaceService;
import com.ctrip.framework.apollo.portal.service.RoleInitializationService;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -50,6 +51,8 @@ public class NamespaceController {
private NamespaceService namespaceService;
@Autowired
private AppNamespaceService appNamespaceService;
@Autowired
private RoleInitializationService roleInitializationService;

@RequestMapping("/appnamespaces/public")
public List<AppNamespace> findPublicAppNamespaces() {
Expand All @@ -62,6 +65,7 @@ public ResponseEntity<Void> createNamespace(@PathVariable String appId,
@RequestBody List<NamespaceCreationModel> models) {

checkModel(!CollectionUtils.isEmpty(models));
roleInitializationService.initNamespaceRoles(appId, models.get(0).getNamespace().getNamespaceName());

for (NamespaceCreationModel model : models) {
NamespaceDTO namespace = model.getNamespace();
Expand Down
4 changes: 1 addition & 3 deletions apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/NamespaceService.java
View file
Expand Up @@ -43,8 +43,7 @@ public class NamespaceService {
@Autowired
private AdminServiceAPI.NamespaceAPI namespaceAPI;

@Autowired
private RoleInitializationService roleInitializationService;

@Autowired
private AppNamespaceService appNamespaceService;

Expand All @@ -57,7 +56,6 @@ public NamespaceDTO createNamespace(Env env, NamespaceDTO namespace) {
namespace.setDataChangeLastModifiedBy(userInfoHolder.getUser().getUserId());
NamespaceDTO createdNamespace = namespaceAPI.createNamespace(env, namespace);

roleInitializationService.initNamespaceRoles(namespace.getAppId(), namespace.getNamespaceName());
return createdNamespace;
}

Expand Down
30 changes: 21 additions & 9 deletions ...o-portal/src/main/resources/static/scripts/controller/config/ConfigNamespaceController.js
View file
Expand Up @@ -144,23 +144,24 @@ application_module.controller("ConfigNamespaceController",


$scope.tableViewOperType = '', $scope.item = {};
var toOperationNamespace;

//查看配置
function retrieveItem(namespace, item, oldValue) {
switchTableViewOperType(TABLE_VIEW_OPER_TYPE.RETRIEVE);
$scope.item = item;
$scope.item.oldValue = oldValue;
toOperationNamespaceName = namespace.namespace.namespaceName;
toOperationNamespace = namespace;
$scope.hasModifyPermission = namespace.hasModifyPermission;
}

var toDeleteItemId = 0, toDeleteNamespace = {};
var toDeleteItemId = 0;
function preDeleteItem(namespace, itemId) {
if (!lockCheck(namespace)){
return;
}

toDeleteNamespace = namespace;
toOperationNamespace = namespace;
toDeleteItemId = itemId;

$("#deleteConfirmDialog").modal("show");
Expand All @@ -170,7 +171,7 @@ application_module.controller("ConfigNamespaceController",
ConfigService.delete_item($rootScope.pageContext.appId,
$rootScope.pageContext.env,
$rootScope.pageContext.clusterName,
toDeleteNamespace.namespace.namespaceName,
toOperationNamespace.namespace.namespaceName,
toDeleteItemId).then(
function (result) {
toastr.success("删除成功!");
Expand All @@ -180,15 +181,14 @@ application_module.controller("ConfigNamespaceController",
});
}

var toOperationNamespaceName = '';
//修改配置
function editItem(namespace, item) {
if (!lockCheck(namespace)){
return;
}
switchTableViewOperType(TABLE_VIEW_OPER_TYPE.UPDATE);
$scope.item = item;
toOperationNamespaceName = namespace.namespace.namespaceName;
toOperationNamespace = namespace;

$("#itemModal").modal("show");
}
Expand All @@ -201,7 +201,7 @@ application_module.controller("ConfigNamespaceController",

switchTableViewOperType(TABLE_VIEW_OPER_TYPE.CREATE);
$scope.item = {};
toOperationNamespaceName = namespace.namespace.namespaceName;
toOperationNamespace = namespace;
$('#itemModal').modal('show');
}

Expand All @@ -225,11 +225,23 @@ application_module.controller("ConfigNamespaceController",
}
selectedClusters.forEach(function (cluster) {
if ($scope.tableViewOperType == TABLE_VIEW_OPER_TYPE.CREATE) {
//check key unique
var hasRepeatKey = false;
toOperationNamespace.items.forEach(function (item) {
if ($scope.item.key == item.item.key){
toastr.error("key=" + $scope.item.key + " 已存在");
hasRepeatKey = true;
return;
}
});
if (hasRepeatKey){
return;
}

ConfigService.create_item($rootScope.pageContext.appId,
cluster.env,
cluster.name,
toOperationNamespaceName,
toOperationNamespace.namespace.namespaceName,
$scope.item).then(
function (result) {
toastr.success(cluster.env + " , " + $scope.item.key,
Expand All @@ -248,7 +260,7 @@ application_module.controller("ConfigNamespaceController",
ConfigService.update_item($rootScope.pageContext.appId,
cluster.env,
cluster.name,
toOperationNamespaceName,
toOperationNamespace.namespace.namespaceName,
$scope.item).then(
function (result) {
toastr.success("更新成功, 如需生效请发布");
Expand Down

0 comments on commit 5395c80

Please sign in to comment.