diff --git a/zheng-cms/pom.xml b/zheng-cms/pom.xml index 036f4cbc..39caea82 100644 --- a/zheng-cms/pom.xml +++ b/zheng-cms/pom.xml @@ -26,13 +26,14 @@ zheng-cms-job zheng-cms-search zheng-cms-admin + zheng-cms-common com.zheng - zheng-common + zheng-cms-common 1.0.0 jar diff --git a/zheng-cms/zheng-cms-admin/src/main/resources/applicationContext-dubbo-consumer.xml b/zheng-cms/zheng-cms-admin/src/main/resources/applicationContext-dubbo-consumer.xml index c29cfa82..16c9ef98 100644 --- a/zheng-cms/zheng-cms-admin/src/main/resources/applicationContext-dubbo-consumer.xml +++ b/zheng-cms/zheng-cms-admin/src/main/resources/applicationContext-dubbo-consumer.xml @@ -14,14 +14,15 @@ + - + - + - + - + \ No newline at end of file diff --git a/zheng-cms/zheng-cms-admin/src/main/resources/config.properties b/zheng-cms/zheng-cms-admin/src/main/resources/config.properties index 47a8063d..d2404f13 100644 --- a/zheng-cms/zheng-cms-admin/src/main/resources/config.properties +++ b/zheng-cms/zheng-cms-admin/src/main/resources/config.properties @@ -1,2 +1,4 @@ env=${profile.env} -zheng-ui.version=${zheng-ui.version} \ No newline at end of file +zheng-ui.version=${zheng-ui.version} +### activeMq +AvtiveMQ.brokerURL=${AvtiveMQ.brokerURL} \ No newline at end of file diff --git a/zheng-cms/zheng-cms-common/pom.xml b/zheng-cms/zheng-cms-common/pom.xml new file mode 100644 index 00000000..d0e8121f --- /dev/null +++ b/zheng-cms/zheng-cms-common/pom.xml @@ -0,0 +1,56 @@ + + 4.0.0 + + + com.zheng + zheng-cms + 1.0.0 + + + zheng-cms-common + jar + + zheng-cms-common + http://www.zhangshuzheng.cn + + + UTF-8 + + + + + com.zheng + zheng-common + 1.0.0 + jar + + + + + zheng-cms-common + + + src/main/java + + **/*.xml + + true + + + src/main/resources + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.18.1 + + true + true + + + + + diff --git a/zheng-cms/zheng-cms-common/src/main/java/com/zheng/cms/common/constant/CmsConstant.java b/zheng-cms/zheng-cms-common/src/main/java/com/zheng/cms/common/constant/CmsConstant.java new file mode 100644 index 00000000..debd94ac --- /dev/null +++ b/zheng-cms/zheng-cms-common/src/main/java/com/zheng/cms/common/constant/CmsConstant.java @@ -0,0 +1,10 @@ +package com.zheng.cms.common.constant; + +import com.zheng.common.base.BaseConstants; + +/** + * cms系统常量类 + * Created by shuzheng on 2017/2/19. + */ +public class CmsConstant extends BaseConstants { +} diff --git a/zheng-cms/zheng-cms-common/src/main/java/com/zheng/cms/common/constant/CmsResult.java b/zheng-cms/zheng-cms-common/src/main/java/com/zheng/cms/common/constant/CmsResult.java new file mode 100644 index 00000000..ad0b0715 --- /dev/null +++ b/zheng-cms/zheng-cms-common/src/main/java/com/zheng/cms/common/constant/CmsResult.java @@ -0,0 +1,19 @@ +package com.zheng.cms.common.constant; + +import com.zheng.common.base.BaseResult; + +/** + * cms系统常量枚举类 + * Created by shuzheng on 2017/2/19. + */ +public class CmsResult extends BaseResult { + + public CmsResult(int code, String message, Object data) { + super(code, message, data); + } + + public CmsResult(CmsResultConstant cmsResultConstant, Object data) { + super(cmsResultConstant.getCode(), cmsResultConstant.getMessage(), data); + } + +} diff --git a/zheng-cms/zheng-cms-common/src/main/java/com/zheng/cms/common/constant/CmsResultConstant.java b/zheng-cms/zheng-cms-common/src/main/java/com/zheng/cms/common/constant/CmsResultConstant.java new file mode 100644 index 00000000..551741c8 --- /dev/null +++ b/zheng-cms/zheng-cms-common/src/main/java/com/zheng/cms/common/constant/CmsResultConstant.java @@ -0,0 +1,36 @@ +package com.zheng.cms.common.constant; + +/** + * cms系统接口结果常量枚举类 + * Created by shuzheng on 2017/2/19. + */ +public enum CmsResultConstant { + + SUCCESS(1, "success"); + + public int code; + + public String message; + + CmsResultConstant(int code, String message) { + this.code = code; + this.message = message; + } + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + +} diff --git a/zheng-cms/zheng-cms-dao/pom.xml b/zheng-cms/zheng-cms-dao/pom.xml index 52f7a9a6..16e011f2 100644 --- a/zheng-cms/zheng-cms-dao/pom.xml +++ b/zheng-cms/zheng-cms-dao/pom.xml @@ -21,7 +21,7 @@ com.zheng - zheng-common + zheng-cms-common