Merge pull request #216 from lepdou/portal_db

apollo-biz/pom.xml

@@ -18,10 +18,6 @@
 			<groupId>com.ctrip.framework.apollo</groupId>
 			<artifactId>apollo-common</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>
-		</dependency>
 		<!-- eureka -->
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
@@ -29,10 +25,6 @@
 		</dependency>
 		<!-- end of eureka -->
 		<dependency>
-			<groupId>mysql</groupId>
-			<artifactId>mysql-connector-java</artifactId>
-		</dependency>
-		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
 			<scope>test</scope>

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/App.java

 package com.ctrip.framework.apollo.biz.entity;
 
+import com.ctrip.framework.apollo.common.entity.BaseEntity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/AppNamespace.java

 package com.ctrip.framework.apollo.biz.entity;
 
+import com.ctrip.framework.apollo.common.entity.BaseEntity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Audit.java

 package com.ctrip.framework.apollo.biz.entity;
 
+import com.ctrip.framework.apollo.common.entity.BaseEntity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Cluster.java

 package com.ctrip.framework.apollo.biz.entity;
 
+import com.ctrip.framework.apollo.common.entity.BaseEntity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Commit.java

 package com.ctrip.framework.apollo.biz.entity;
 
+import com.ctrip.framework.apollo.common.entity.BaseEntity;
+
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
@@ -11,7 +13,7 @@ import javax.persistence.Table;
 @Table(name = "commit")
 @SQLDelete(sql = "Update commit set isDeleted = 1 where id = ?")
 @Where(clause = "isDeleted = 0")
-public class Commit extends BaseEntity{
+public class Commit extends BaseEntity {
 
   @Column(name = "ChangeSets", nullable = false)
   private String changeSets;

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Item.java

 package com.ctrip.framework.apollo.biz.entity;
 
+import com.ctrip.framework.apollo.common.entity.BaseEntity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Namespace.java

 package com.ctrip.framework.apollo.biz.entity;
 
+import com.ctrip.framework.apollo.common.entity.BaseEntity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Privilege.java

 package com.ctrip.framework.apollo.biz.entity;
 
+import com.ctrip.framework.apollo.common.entity.BaseEntity;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Release.java

 package com.ctrip.framework.apollo.biz.entity;
 
+import com.ctrip.framework.apollo.common.entity.BaseEntity;
+
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/ServerConfig.java

 package com.ctrip.framework.apollo.biz.entity;
 
+import com.ctrip.framework.apollo.common.entity.BaseEntity;
+
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 

apollo-biz/src/main/resources/application.properties

-# DataSource
-spring.datasource.testWhileIdle=true
-spring.datasource.testOnBorrow=true
-spring.datasource.validationQuery=SELECT 1
-
-# Naming strategy
-spring.jpa.hibernate.naming_strategy=org.hibernate.cfg.EJB3NamingStrategy
-spring.jpa.hibernate.globally_quoted_identifiers=true
-spring.jpa.properties.hibernate.globally_quoted_identifiers=true
-
-# Tomcat configuration
-server.tomcat.accept-count=1024

apollo-common/pom.xml

@@ -36,7 +36,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-aop</artifactId>
+			<artifactId>spring-boot-starter-data-jpa</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.data</groupId>

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/datasource/TitanCondition.java → apollo-common/src/main/java/com/ctrip/framework/apollo/common/datasource/TitanCondition.java

-package com.ctrip.framework.apollo.biz.datasource;
+package com.ctrip.framework.apollo.common.datasource;
 
 import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/datasource/TitanEntityManager.java → apollo-common/src/main/java/com/ctrip/framework/apollo/common/datasource/TitanEntityManager.java

-package com.ctrip.framework.apollo.biz.datasource;
+package com.ctrip.framework.apollo.common.datasource;
 
 import java.lang.reflect.Method;
 

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/datasource/TitanSettings.java → apollo-common/src/main/java/com/ctrip/framework/apollo/common/datasource/TitanSettings.java

-package com.ctrip.framework.apollo.biz.datasource;
+package com.ctrip.framework.apollo.common.datasource;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/BaseEntity.java → apollo-common/src/main/java/com/ctrip/framework/apollo/common/entity/BaseEntity.java

-package com.ctrip.framework.apollo.biz.entity;
+package com.ctrip.framework.apollo.common.entity;
 
 import java.util.Date;
 

apollo-common/src/main/resources/application.properties

-spring.http.converters.preferred-json-mapper=gson
\ No newline at end of file
+spring.http.converters.preferred-json-mapper=gson
+
+# DataSource
+spring.datasource.testWhileIdle=true
+spring.datasource.testOnBorrow=true
+spring.datasource.validationQuery=SELECT 1
+
+# Naming strategy
+spring.jpa.hibernate.naming_strategy=org.hibernate.cfg.EJB3NamingStrategy
+spring.jpa.hibernate.globally_quoted_identifiers=true
+spring.jpa.properties.hibernate.globally_quoted_identifiers=true
+
+# Tomcat configuration
+server.tomcat.accept-count=1024

apollo-portal/pom.xml

@@ -23,6 +23,11 @@
 			<artifactId>apollo-buildtools</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/PortalAppController.java

@@ -17,7 +17,7 @@ import com.ctrip.framework.apollo.core.enums.Env;
 import com.ctrip.framework.apollo.core.exception.BadRequestException;
 import com.ctrip.framework.apollo.core.utils.StringUtils;
 import com.ctrip.framework.apollo.portal.PortalSettings;
-import com.ctrip.framework.apollo.portal.entity.EnvClusterInfo;
+import com.ctrip.framework.apollo.portal.entity.vo.EnvClusterInfo;
 import com.ctrip.framework.apollo.portal.service.PortalAppService;
 
 import java.util.List;

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/PortalConfigController.java

@@ -6,7 +6,7 @@ import com.ctrip.framework.apollo.core.enums.Env;
 import com.ctrip.framework.apollo.core.dto.ReleaseDTO;
 import com.ctrip.framework.apollo.core.exception.BadRequestException;
 import com.ctrip.framework.apollo.core.utils.StringUtils;
-import com.ctrip.framework.apollo.portal.entity.ItemDiffs;
+import com.ctrip.framework.apollo.portal.entity.vo.ItemDiffs;
 import com.ctrip.framework.apollo.portal.entity.form.NamespaceSyncModel;
 import com.ctrip.framework.apollo.portal.entity.form.NamespaceTextModel;
 import com.ctrip.framework.apollo.portal.entity.form.NamespaceReleaseModel;

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/PortalNamespaceController.java

@@ -5,7 +5,7 @@ import com.ctrip.framework.apollo.core.dto.NamespaceDTO;
 import com.ctrip.framework.apollo.core.enums.Env;
 import com.ctrip.framework.apollo.core.exception.BadRequestException;
 import com.ctrip.framework.apollo.core.utils.StringUtils;
-import com.ctrip.framework.apollo.portal.entity.NamespaceVO;
+import com.ctrip.framework.apollo.portal.entity.vo.NamespaceVO;
 import com.ctrip.framework.apollo.portal.service.PortalNamespaceService;
 
 import org.springframework.beans.factory.annotation.Autowired;

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/form/NamespaceSyncModel.java

 package com.ctrip.framework.apollo.portal.entity.form;
 
 import com.ctrip.framework.apollo.core.dto.ItemDTO;
-import com.ctrip.framework.apollo.portal.entity.NamespaceIdentifer;
+import com.ctrip.framework.apollo.portal.entity.vo.NamespaceIdentifer;
 
 import org.springframework.util.CollectionUtils;
 

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/po/ServerConfig.java

+package com.ctrip.framework.apollo.portal.entity.po;
+
+import com.ctrip.framework.apollo.common.entity.BaseEntity;
+
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @author Jason Song(song_s@ctrip.com)
+ */
+@Entity
+@Table(name = "ServerConfig")
+@SQLDelete(sql = "Update ServerConfig set isDeleted = 1 where id = ?")
+@Where(clause = "isDeleted = 0")
+public class ServerConfig extends BaseEntity {
+  @Column(name = "Key", nullable = false)
+  private String key;
+
+  @Column(name = "Value", nullable = false)
+  private String value;
+
+  @Column(name = "Comment", nullable = false)
+  private String comment;
+
+  public String getKey() {
+    return key;
+  }
+
+  public void setKey(String key) {
+    this.key = key;
+  }
+
+  public String getValue() {
+    return value;
+  }
+
+  public void setValue(String value) {
+    this.value = value;
+  }
+
+  public String getComment() {
+    return comment;
+  }
+
+  public void setComment(String comment) {
+    this.comment = comment;
+  }
+
+  public String toString() {
+    return toStringHelper().add("key", key).add("value", value).add("comment", comment).toString();
+  }
+}

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/EnvClusterInfo.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/vo/EnvClusterInfo.java

-package com.ctrip.framework.apollo.portal.entity;
+package com.ctrip.framework.apollo.portal.entity.vo;
 
 import com.ctrip.framework.apollo.core.dto.ClusterDTO;
 import com.ctrip.framework.apollo.core.enums.Env;

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/ItemDiffs.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/vo/ItemDiffs.java

-package com.ctrip.framework.apollo.portal.entity;
+package com.ctrip.framework.apollo.portal.entity.vo;
 
 import com.ctrip.framework.apollo.core.dto.ItemChangeSets;
 

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/NamespaceIdentifer.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/vo/NamespaceIdentifer.java

-package com.ctrip.framework.apollo.portal.entity;
+package com.ctrip.framework.apollo.portal.entity.vo;
 
 import com.ctrip.framework.apollo.core.enums.Env;
 import com.ctrip.framework.apollo.core.utils.StringUtils;

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/NamespaceVO.java → apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/entity/vo/NamespaceVO.java

-package com.ctrip.framework.apollo.portal.entity;
+package com.ctrip.framework.apollo.portal.entity.vo;
 import com.ctrip.framework.apollo.core.dto.ItemDTO;
 import com.ctrip.framework.apollo.core.dto.NamespaceDTO;
 

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/repository/ServerConfigRepository.java

+package com.ctrip.framework.apollo.portal.repository;
+
+
+import com.ctrip.framework.apollo.portal.entity.po.ServerConfig;
+
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+/**
+ * @author Jason Song(song_s@ctrip.com)
+ */
+public interface ServerConfigRepository extends PagingAndSortingRepository<ServerConfig, Long> {
+  ServerConfig findByKey(String key);
+}

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/PortalAppService.java

@@ -17,7 +17,7 @@ import com.ctrip.framework.apollo.core.exception.BadRequestException;
 import com.ctrip.framework.apollo.core.exception.ServiceException;
 import com.ctrip.framework.apollo.portal.PortalSettings;
 import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
-import com.ctrip.framework.apollo.portal.entity.EnvClusterInfo;
+import com.ctrip.framework.apollo.portal.entity.vo.EnvClusterInfo;
 
 @Service
 public class PortalAppService {

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/PortalConfigService.java

@@ -18,8 +18,8 @@ import com.ctrip.framework.apollo.core.exception.BadRequestException;
 import com.ctrip.framework.apollo.core.exception.NotFoundException;
 import com.ctrip.framework.apollo.core.exception.ServiceException;
 import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
-import com.ctrip.framework.apollo.portal.entity.ItemDiffs;
-import com.ctrip.framework.apollo.portal.entity.NamespaceIdentifer;
+import com.ctrip.framework.apollo.portal.entity.vo.ItemDiffs;
+import com.ctrip.framework.apollo.portal.entity.vo.NamespaceIdentifer;
 import com.ctrip.framework.apollo.portal.entity.form.NamespaceTextModel;
 import com.ctrip.framework.apollo.portal.entity.form.NamespaceReleaseModel;
 import com.ctrip.framework.apollo.portal.service.txtresolver.ConfigTextResolver;

apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/service/PortalNamespaceService.java

@@ -11,7 +11,7 @@ import com.ctrip.framework.apollo.core.enums.Env;
 import com.ctrip.framework.apollo.core.utils.StringUtils;
 import com.ctrip.framework.apollo.portal.PortalSettings;
 import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
-import com.ctrip.framework.apollo.portal.entity.NamespaceVO;
+import com.ctrip.framework.apollo.portal.entity.vo.NamespaceVO;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

apollo-portal/src/main/resources/portal.properties

 spring.application.name= apollo-portal
-apollo.portal.env= fat,uat,pro
+apollo.portal.env= fat,uat
 ctrip.appid= 100003173
 server.port= 8070
 logging.file= /opt/logs/100003173/apollo-portal.log

apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/ConfigServiceTest.java

@@ -6,8 +6,8 @@ import com.ctrip.framework.apollo.core.dto.ItemDTO;
 import com.ctrip.framework.apollo.core.dto.NamespaceDTO;
 import com.ctrip.framework.apollo.core.enums.Env;
 import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
-import com.ctrip.framework.apollo.portal.entity.ItemDiffs;
-import com.ctrip.framework.apollo.portal.entity.NamespaceIdentifer;
+import com.ctrip.framework.apollo.portal.entity.vo.ItemDiffs;
+import com.ctrip.framework.apollo.portal.entity.vo.NamespaceIdentifer;
 import com.ctrip.framework.apollo.portal.entity.form.NamespaceTextModel;
 import com.ctrip.framework.apollo.portal.service.PortalConfigService;
 import com.ctrip.framework.apollo.portal.service.txtresolver.PropertyResolver;

apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/NamespaceServiceTest.java

@@ -5,7 +5,7 @@ import com.ctrip.framework.apollo.core.dto.NamespaceDTO;
 import com.ctrip.framework.apollo.core.dto.ReleaseDTO;
 import com.ctrip.framework.apollo.core.enums.Env;
 import com.ctrip.framework.apollo.portal.api.AdminServiceAPI;
-import com.ctrip.framework.apollo.portal.entity.NamespaceVO;
+import com.ctrip.framework.apollo.portal.entity.vo.NamespaceVO;
 import com.ctrip.framework.apollo.portal.service.PortalNamespaceService;
 import com.ctrip.framework.apollo.portal.service.txtresolver.PropertyResolver;