From 7304c099b31676b8c8afbcdc49f2b3930a511e46 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 14 Apr 2020 13:20:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=85=A8=E9=83=A8=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=96=B0=E5=A2=9EDockerfile=E5=92=8Cdocker-compose.yaml?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E6=9C=8D=E5=8A=A1=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=E4=BB=8E2.0.11=E5=BC=80=E5=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/Dockerfile | 2 +- .../epmet-admin-server/docker-compose.yml | 9 +++++++-- epmet-admin/epmet-admin-server/pom.xml | 2 +- epmet-auth/Dockerfile | 11 +++++++++++ epmet-auth/docker-compose.yml | 13 +++++++++++++ epmet-auth/pom.xml | 2 +- epmet-gateway/Dockerfile | 2 +- epmet-gateway/docker-compose.yml | 18 +++++++++--------- epmet-gateway/pom.xml | 2 +- .../epmet-activiti-server/Dockerfile | 11 +++++++++++ .../epmet-activiti-server/docker-compose.yml | 13 +++++++++++++ .../epmet-activiti-server/pom.xml | 2 +- .../epmet-job/epmet-job-server/Dockerfile | 11 +++++++++++ .../epmet-job-server/docker-compose.yml | 13 +++++++++++++ .../epmet-job/epmet-job-server/pom.xml | 2 +- .../epmet-message-server/Dockerfile | 11 +++++++++++ .../epmet-message-server/docker-compose.yml | 13 +++++++++++++ .../epmet-message/epmet-message-server/pom.xml | 2 +- .../epmet-oss/epmet-oss-server/Dockerfile | 11 +++++++++++ .../epmet-oss-server/docker-compose.yml | 13 +++++++++++++ epmet-module/gov-org/gov-org-server/Dockerfile | 11 +++++++++++ .../gov-org/gov-org-server/docker-compose.yml | 13 +++++++++++++ epmet-module/gov-org/gov-org-server/pom.xml | 2 +- .../oper-access/oper-access-server/Dockerfile | 11 +++++++++++ .../oper-access-server/docker-compose.yml | 13 +++++++++++++ .../oper-access/oper-access-server/pom.xml | 2 +- .../oper-crm/oper-crm-server/Dockerfile | 11 +++++++++++ .../oper-crm-server/docker-compose.yml | 13 +++++++++++++ epmet-module/oper-crm/oper-crm-server/pom.xml | 2 +- .../oper-customize-server/Dockerfile | 11 +++++++++++ .../oper-customize-server/docker-compose.yml | 13 +++++++++++++ .../oper-customize-server/pom.xml | 2 +- .../resi-group/resi-group-server/Dockerfile | 11 +++++++++++ .../resi-group-server/docker-compose.yml | 13 +++++++++++++ .../resi-group/resi-group-server/pom.xml | 2 +- .../resi-guide/resi-guide-server/Dockerfile | 11 +++++++++++ .../resi-guide-server/docker-compose.yml | 13 +++++++++++++ .../resi-guide/resi-guide-server/pom.xml | 2 +- .../resi-mine/resi-mine-server/Dockerfile | 11 +++++++++++ .../resi-mine-server/docker-compose.yml | 13 +++++++++++++ .../resi-mine/resi-mine-server/pom.xml | 2 +- .../resi-partymember-server/Dockerfile | 11 +++++++++++ .../resi-partymember-server/docker-compose.yml | 13 +++++++++++++ .../resi-partymember-server/pom.xml | 2 +- epmet-user/epmet-user-server/Dockerfile | 2 +- .../epmet-user-server/docker-compose.yml | 4 ++-- epmet-user/epmet-user-server/pom.xml | 2 +- 47 files changed, 348 insertions(+), 31 deletions(-) create mode 100644 epmet-auth/Dockerfile create mode 100644 epmet-auth/docker-compose.yml create mode 100644 epmet-module/epmet-activiti/epmet-activiti-server/Dockerfile create mode 100644 epmet-module/epmet-activiti/epmet-activiti-server/docker-compose.yml create mode 100644 epmet-module/epmet-job/epmet-job-server/Dockerfile create mode 100644 epmet-module/epmet-job/epmet-job-server/docker-compose.yml create mode 100644 epmet-module/epmet-message/epmet-message-server/Dockerfile create mode 100644 epmet-module/epmet-message/epmet-message-server/docker-compose.yml create mode 100644 epmet-module/epmet-oss/epmet-oss-server/Dockerfile create mode 100644 epmet-module/epmet-oss/epmet-oss-server/docker-compose.yml create mode 100644 epmet-module/gov-org/gov-org-server/Dockerfile create mode 100644 epmet-module/gov-org/gov-org-server/docker-compose.yml create mode 100644 epmet-module/oper-access/oper-access-server/Dockerfile create mode 100644 epmet-module/oper-access/oper-access-server/docker-compose.yml create mode 100644 epmet-module/oper-crm/oper-crm-server/Dockerfile create mode 100644 epmet-module/oper-crm/oper-crm-server/docker-compose.yml create mode 100644 epmet-module/oper-customize/oper-customize-server/Dockerfile create mode 100644 epmet-module/oper-customize/oper-customize-server/docker-compose.yml create mode 100644 epmet-module/resi-group/resi-group-server/Dockerfile create mode 100644 epmet-module/resi-group/resi-group-server/docker-compose.yml create mode 100644 epmet-module/resi-guide/resi-guide-server/Dockerfile create mode 100644 epmet-module/resi-guide/resi-guide-server/docker-compose.yml create mode 100644 epmet-module/resi-mine/resi-mine-server/Dockerfile create mode 100644 epmet-module/resi-mine/resi-mine-server/docker-compose.yml create mode 100644 epmet-module/resi-partymember/resi-partymember-server/Dockerfile create mode 100644 epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml diff --git a/epmet-admin/epmet-admin-server/Dockerfile b/epmet-admin/epmet-admin-server/Dockerfile index 52c7bfba5f..38da8a0872 100644 --- a/epmet-admin/epmet-admin-server/Dockerfile +++ b/epmet-admin/epmet-admin-server/Dockerfile @@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar EXPOSE 8082 -ENTRYPOINT ["java","-jar","./app.jar"] \ No newline at end of file +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-admin/epmet-admin-server/docker-compose.yml b/epmet-admin/epmet-admin-server/docker-compose.yml index 97c34cb896..09e4bd8dce 100644 --- a/epmet-admin/epmet-admin-server/docker-compose.yml +++ b/epmet-admin/epmet-admin-server/docker-compose.yml @@ -2,7 +2,12 @@ version: "3.7" services: epmet-admin-server: container_name: epmet-admin-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-admin-server:2.0.1 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-admin-server:2.0.11 ports: - "8082:8082" - network_mode: bridge # 不会创建新的网络 \ No newline at end of file + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 66ae9b3533..4f88956c46 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + 2.0.11 com.epmet epmet-admin diff --git a/epmet-auth/Dockerfile b/epmet-auth/Dockerfile new file mode 100644 index 0000000000..ab95a2ca96 --- /dev/null +++ b/epmet-auth/Dockerfile @@ -0,0 +1,11 @@ +FROM java:8 + +RUN export LANG="zh_CN.UTF-8" +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' > /etc/timezone + +COPY ./target/*.jar ./app.jar + +EXPOSE 8081 + +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-auth/docker-compose.yml b/epmet-auth/docker-compose.yml new file mode 100644 index 0000000000..8457f689d4 --- /dev/null +++ b/epmet-auth/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3.7" +services: + epmet-auth-server: + container_name: epmet-auth-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-auth-server:2.0.11 + ports: + - "8081:8081" + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 2842c7a96c..8122c0a622 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + 2.0.11 com.epmet epmet-cloud diff --git a/epmet-gateway/Dockerfile b/epmet-gateway/Dockerfile index dc143291df..f14c4a8d68 100644 --- a/epmet-gateway/Dockerfile +++ b/epmet-gateway/Dockerfile @@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar EXPOSE 8080 -ENTRYPOINT ["java","-jar","./app.jar"] \ No newline at end of file +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-gateway/docker-compose.yml b/epmet-gateway/docker-compose.yml index d973dd4ca1..c2ea41442c 100644 --- a/epmet-gateway/docker-compose.yml +++ b/epmet-gateway/docker-compose.yml @@ -1,13 +1,13 @@ version: "3.7" services: - epmet-gateway: # 会自动生成容器名称: <当前所在目录>_epmet-gateway_1，依赖于所在目录，不稳定，所以使用container_name 完全手动指定 - container_name: epmet-gateway-dev # 完全手动指定容器NAME - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-gateway:2.0.1 + epmet-gateway-server: + container_name: epmet-gateway-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-gateway-server:2.0.11 ports: - "8080:8080" - network_mode: bridge # 不会创建新的网络 - -# 定义新的网络 -#networks: -# epmet-gateway: # 会自动生成容器网络名称: <当前所在目录>_epmet-gateway -# driver: bridge \ No newline at end of file + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index f8f1d96b77..3111a2a98d 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + 2.0.11 com.epmet epmet-cloud diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/Dockerfile b/epmet-module/epmet-activiti/epmet-activiti-server/Dockerfile new file mode 100644 index 0000000000..8df45bff54 --- /dev/null +++ b/epmet-module/epmet-activiti/epmet-activiti-server/Dockerfile @@ -0,0 +1,11 @@ +FROM java:8 + +RUN export LANG="zh_CN.UTF-8" +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' > /etc/timezone + +COPY ./target/*.jar ./app.jar + +EXPOSE 8086 + +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/docker-compose.yml b/epmet-module/epmet-activiti/epmet-activiti-server/docker-compose.yml new file mode 100644 index 0000000000..788a67f979 --- /dev/null +++ b/epmet-module/epmet-activiti/epmet-activiti-server/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3.7" +services: + epmet-activiti-server: + container_name: epmet-activiti-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-activiti-server:2.0.11 + ports: + - "8086:8086" + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index df5bebdd66..0dc436374d 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + 2.0.11 com.epmet epmet-activiti diff --git a/epmet-module/epmet-job/epmet-job-server/Dockerfile b/epmet-module/epmet-job/epmet-job-server/Dockerfile new file mode 100644 index 0000000000..72a8e2950b --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/Dockerfile @@ -0,0 +1,11 @@ +FROM java:8 + +RUN export LANG="zh_CN.UTF-8" +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' > /etc/timezone + +COPY ./target/*.jar ./app.jar + +EXPOSE 8084 + +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-module/epmet-job/epmet-job-server/docker-compose.yml b/epmet-module/epmet-job/epmet-job-server/docker-compose.yml new file mode 100644 index 0000000000..d5c11abe86 --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3.7" +services: + epmet-job-server: + container_name: epmet-job-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-job-server:2.0.11 + ports: + - "8084:8084" + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index a2784eae25..c1deb54470 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + 2.0.11 com.epmet epmet-job diff --git a/epmet-module/epmet-message/epmet-message-server/Dockerfile b/epmet-module/epmet-message/epmet-message-server/Dockerfile new file mode 100644 index 0000000000..36720c4a38 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/Dockerfile @@ -0,0 +1,11 @@ +FROM java:8 + +RUN export LANG="zh_CN.UTF-8" +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' > /etc/timezone + +COPY ./target/*.jar ./app.jar + +EXPOSE 8085 + +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/docker-compose.yml b/epmet-module/epmet-message/epmet-message-server/docker-compose.yml new file mode 100644 index 0000000000..85837cc6fe --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3.7" +services: + epmet-message-server: + container_name: epmet-message-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-message-server:2.0.11 + ports: + - "8085:8085" + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index d822419549..c41034461a 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + 2.0.11 com.epmet epmet-message diff --git a/epmet-module/epmet-oss/epmet-oss-server/Dockerfile b/epmet-module/epmet-oss/epmet-oss-server/Dockerfile new file mode 100644 index 0000000000..2e985a6189 --- /dev/null +++ b/epmet-module/epmet-oss/epmet-oss-server/Dockerfile @@ -0,0 +1,11 @@ +FROM java:8 + +RUN export LANG="zh_CN.UTF-8" +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' > /etc/timezone + +COPY ./target/*.jar ./app.jar + +EXPOSE 8083 + +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-module/epmet-oss/epmet-oss-server/docker-compose.yml b/epmet-module/epmet-oss/epmet-oss-server/docker-compose.yml new file mode 100644 index 0000000000..75543adf5d --- /dev/null +++ b/epmet-module/epmet-oss/epmet-oss-server/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3.7" +services: + epmet-oss-server: + container_name: epmet-oss-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-oss-server:2.0.10 + ports: + - "8083:8083" + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/Dockerfile b/epmet-module/gov-org/gov-org-server/Dockerfile new file mode 100644 index 0000000000..05e0085107 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/Dockerfile @@ -0,0 +1,11 @@ +FROM java:8 + +RUN export LANG="zh_CN.UTF-8" +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' > /etc/timezone + +COPY ./target/*.jar ./app.jar + +EXPOSE 8092 + +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/docker-compose.yml b/epmet-module/gov-org/gov-org-server/docker-compose.yml new file mode 100644 index 0000000000..4d156dba53 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3.7" +services: + gov-org-server: + container_name: gov-org-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:2.0.11 + ports: + - "8092:8092" + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index bd5863a670..04d69d1b18 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + 2.0.11 com.epmet gov-org diff --git a/epmet-module/oper-access/oper-access-server/Dockerfile b/epmet-module/oper-access/oper-access-server/Dockerfile new file mode 100644 index 0000000000..bde41338e6 --- /dev/null +++ b/epmet-module/oper-access/oper-access-server/Dockerfile @@ -0,0 +1,11 @@ +FROM java:8 + +RUN export LANG="zh_CN.UTF-8" +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' > /etc/timezone + +COPY ./target/*.jar ./app.jar + +EXPOSE 8093 + +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-module/oper-access/oper-access-server/docker-compose.yml b/epmet-module/oper-access/oper-access-server/docker-compose.yml new file mode 100644 index 0000000000..855aa6d4af --- /dev/null +++ b/epmet-module/oper-access/oper-access-server/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3.7" +services: + oper-access-server: + container_name: oper-access-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-access-server:2.0.11 + ports: + - "8093:8093" + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml index 8f8e681280..c9ea98b3f4 100644 --- a/epmet-module/oper-access/oper-access-server/pom.xml +++ b/epmet-module/oper-access/oper-access-server/pom.xml @@ -8,7 +8,7 @@ 2.0.0 4.0.0 - + 2.0.11 oper-access-server jar diff --git a/epmet-module/oper-crm/oper-crm-server/Dockerfile b/epmet-module/oper-crm/oper-crm-server/Dockerfile new file mode 100644 index 0000000000..bb97bee10e --- /dev/null +++ b/epmet-module/oper-crm/oper-crm-server/Dockerfile @@ -0,0 +1,11 @@ +FROM java:8 + +RUN export LANG="zh_CN.UTF-8" +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' > /etc/timezone + +COPY ./target/*.jar ./app.jar + +EXPOSE 8090 + +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-module/oper-crm/oper-crm-server/docker-compose.yml b/epmet-module/oper-crm/oper-crm-server/docker-compose.yml new file mode 100644 index 0000000000..7aa1baaf9d --- /dev/null +++ b/epmet-module/oper-crm/oper-crm-server/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3.7" +services: + oper-crm-server: + container_name: oper-crm-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-crm-server:2.0.11 + ports: + - "8090:8090" + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index 4bbfea43c6..dca9088ce2 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + 2.0.11 com.epmet oper-crm diff --git a/epmet-module/oper-customize/oper-customize-server/Dockerfile b/epmet-module/oper-customize/oper-customize-server/Dockerfile new file mode 100644 index 0000000000..0dc758020b --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/Dockerfile @@ -0,0 +1,11 @@ +FROM java:8 + +RUN export LANG="zh_CN.UTF-8" +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' > /etc/timezone + +COPY ./target/*.jar ./app.jar + +EXPOSE 8089 + +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/docker-compose.yml b/epmet-module/oper-customize/oper-customize-server/docker-compose.yml new file mode 100644 index 0000000000..5b35a8a164 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3.7" +services: + oper-customize-server: + container_name: oper-customize-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/oper-customize-server:2.0.11 + ports: + - "8089:8089" + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index 715075b15d..dca630f0f2 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + 2.0.11 com.epmet oper-customize diff --git a/epmet-module/resi-group/resi-group-server/Dockerfile b/epmet-module/resi-group/resi-group-server/Dockerfile new file mode 100644 index 0000000000..f349a97319 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/Dockerfile @@ -0,0 +1,11 @@ +FROM java:8 + +RUN export LANG="zh_CN.UTF-8" +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' > /etc/timezone + +COPY ./target/*.jar ./app.jar + +EXPOSE 8095 + +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/docker-compose.yml b/epmet-module/resi-group/resi-group-server/docker-compose.yml new file mode 100644 index 0000000000..d09364b314 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3.7" +services: + resi-group-server: + container_name: resi-group-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-group-server:2.0.11 + ports: + - "8095:8095" + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index 3873802452..57a6fd1b99 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + 2.0.11 com.epmet resi-group diff --git a/epmet-module/resi-guide/resi-guide-server/Dockerfile b/epmet-module/resi-guide/resi-guide-server/Dockerfile new file mode 100644 index 0000000000..42c62e7b07 --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/Dockerfile @@ -0,0 +1,11 @@ +FROM java:8 + +RUN export LANG="zh_CN.UTF-8" +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' > /etc/timezone + +COPY ./target/*.jar ./app.jar + +EXPOSE 8091 + +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-module/resi-guide/resi-guide-server/docker-compose.yml b/epmet-module/resi-guide/resi-guide-server/docker-compose.yml new file mode 100644 index 0000000000..9d4263879a --- /dev/null +++ b/epmet-module/resi-guide/resi-guide-server/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3.7" +services: + resi-guide-server: + container_name: resi-guide-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-guide-server:2.0.11 + ports: + - "8091:8091" + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index 55dc1ee3c1..9bb295e946 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + 2.0.11 com.epmet resi-guide diff --git a/epmet-module/resi-mine/resi-mine-server/Dockerfile b/epmet-module/resi-mine/resi-mine-server/Dockerfile new file mode 100644 index 0000000000..963b337c1b --- /dev/null +++ b/epmet-module/resi-mine/resi-mine-server/Dockerfile @@ -0,0 +1,11 @@ +FROM java:8 + +RUN export LANG="zh_CN.UTF-8" +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' > /etc/timezone + +COPY ./target/*.jar ./app.jar + +EXPOSE 8094 + +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-module/resi-mine/resi-mine-server/docker-compose.yml b/epmet-module/resi-mine/resi-mine-server/docker-compose.yml new file mode 100644 index 0000000000..68ce45a99e --- /dev/null +++ b/epmet-module/resi-mine/resi-mine-server/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3.7" +services: + resi-mine-server: + container_name: resi-mine-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-mine-server:2.0.11 + ports: + - "8094:8094" + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index 8bab7eec80..bb03bff2e9 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + 2.0.11 com.epmet resi-mine diff --git a/epmet-module/resi-partymember/resi-partymember-server/Dockerfile b/epmet-module/resi-partymember/resi-partymember-server/Dockerfile new file mode 100644 index 0000000000..321b1bffb1 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/Dockerfile @@ -0,0 +1,11 @@ +FROM java:8 + +RUN export LANG="zh_CN.UTF-8" +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' > /etc/timezone + +COPY ./target/*.jar ./app.jar + +EXPOSE 8096 + +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml b/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml new file mode 100644 index 0000000000..6dbb99760b --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3.7" +services: + resi-partymember-server: + container_name: resi-partymember-server-dev + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:2.0.11 + ports: + - "8096:8096" + network_mode: host # 使用现有网络 + deploy: + resources: + limits: + cpus: '0.1' + memory: 250M \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index fd3b44f67b..52ada4bc95 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + 2.0.11 com.epmet resi-partymember diff --git a/epmet-user/epmet-user-server/Dockerfile b/epmet-user/epmet-user-server/Dockerfile index 899b4d8bcc..78011d3dd5 100644 --- a/epmet-user/epmet-user-server/Dockerfile +++ b/epmet-user/epmet-user-server/Dockerfile @@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar EXPOSE 8087 -ENTRYPOINT ["java","-jar","./app.jar"] \ No newline at end of file +ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-user/epmet-user-server/docker-compose.yml b/epmet-user/epmet-user-server/docker-compose.yml index 5e354491a9..c6456e0db6 100644 --- a/epmet-user/epmet-user-server/docker-compose.yml +++ b/epmet-user/epmet-user-server/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-user-server:2.0.0 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:2.0.11 ports: - "8087:8087" - network_mode: bridge # 不会创建新的网络 \ No newline at end of file + network_mode: host # 不会创建新的网络 \ No newline at end of file diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 4461b0da41..b292c23b71 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - + 2.0.11 com.epmet epmet-user From 7020ec6f1e1f8a4f5db84eaf064a85f181cf2edd Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 14 Apr 2020 14:00:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/LoginServiceImpl.java | 13 +++-- .../tools/exception/EpmetErrorCode.java | 43 +++++++++++++-- .../commons/tools/exception/RenException.java | 14 +++-- .../tools/exception/RenExceptionHandler.java | 39 ++++++++++---- .../commons/tools/utils/ModuleUtils.java | 2 +- .../com/epmet/commons/tools/utils/Result.java | 30 +++++++++-- .../com/epmet/controller/DemoController.java | 11 ++-- .../epmet/service/impl/DemoServiceImpl.java | 8 ++- .../controller/MailTemplateController.java | 8 ++- .../epmet/service/impl/SysSmsServiceImpl.java | 2 +- .../epmet/service/impl/OssServiceImpl.java | 9 ++-- .../impl/CustomerStaffGridServiceImpl.java | 8 ++- .../group/controller/ResiGroupController.java | 16 ++++-- .../service/impl/ResiGroupServiceImpl.java | 29 ++++++---- .../impl/ResiGroupStatisticalServiceImpl.java | 18 ++++--- .../impl/GroupInvitationServiceImpl.java | 6 ++- .../impl/ResiGroupMemberServiceImpl.java | 38 +++++++------ .../impl/ResiTopicCommentServiceImpl.java | 21 ++++---- .../service/impl/ResiTopicServiceImpl.java | 53 +++++++++++-------- .../impl/StrangerAccessRecordServiceImpl.java | 6 ++- .../service/impl/ResiMineGridServiceImpl.java | 11 ++-- .../impl/PartyMemberConfirmServiceImpl.java | 12 ++--- .../impl/ResiWarmheartedApplyServiceImpl.java | 10 ++-- .../service/impl/GridLatestServiceImpl.java | 8 ++- .../service/impl/GridVisitedServiceImpl.java | 16 +++--- .../service/impl/UserResiInfoServiceImpl.java | 16 ++---- 26 files changed, 290 insertions(+), 157 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java index 463ffbaed6..4280c7d0f6 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java @@ -82,8 +82,10 @@ public class LoginServiceImpl implements LoginService { UserTokenResultDTO userTokenResultDTO = new UserTokenResultDTO(); userTokenResultDTO.setToken(this.packagingUserToken(formDTO, userId, wxMaJscode2SessionResult)); return new Result().ok(userTokenResultDTO); + }else{ + logger.error("登录失败userId为空"); + throw new RenException("登录失败"); } - return new Result().error("登录失败"); } /** @@ -267,7 +269,8 @@ public class LoginServiceImpl implements LoginService { @Override public Result loginByPassword(LoginByPassWordFormDTO formDTO) { if(LoginConstant.APP_RESI.equals(formDTO.getApp())){ - return new Result().error("居民端请使用微信登录"); + logger.error("居民端请使用微信登录"); + throw new RenException("居民端请使用微信登录"); } //1、验证码是否正确 boolean flag = captchaService.validate(formDTO.getUuid(), formDTO.getCaptcha()); @@ -282,7 +285,8 @@ public class LoginServiceImpl implements LoginService { Result userInfoResult = epmetUserFeignClient.selectLoginUserInfoByPassword(passwordLoginUserInfoFormDTO); logger.info(userInfoResult.getCode() + userInfoResult.getMsg()); if (!userInfoResult.success() || null == userInfoResult.getData()) { - return new Result().error("账号不存在"); + logger.error("账号不存在"); + throw new RenException("账号不存在"); } //3、密码是否正确 //密码错误 @@ -333,7 +337,8 @@ public class LoginServiceImpl implements LoginService { //记录登出日志 //删除redis if(null == tokenDto){ - return new Result().error("当前用户信息获取失败！"); + logger.error("账号不存在"); + throw new RenException("当前用户信息获取失败"); } cpUserDetailRedis.logout(tokenDto.getApp() , tokenDto.getClient() , tokenDto.getUserId()); diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index aae4ac93fb..e29925f033 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -6,6 +6,31 @@ package com.epmet.commons.tools.exception; * @Description: */ public enum EpmetErrorCode { + /*****************以下是框架自带的异常编码s****************************************************/ + INTERNAL_SERVER_ERROR (500,"服务器内部异常"), + UNAUTHORIZED (401,"未授权"), + FORBIDDEN (403,"拒绝访问，没有权限"), + NOT_NULL (10001,"{0}不能为空"), + DB_RECORD_EXISTS ( 10002,"数据库中已存在该记录"), + PARAMS_GET_ERROR ( 10003,"获取参数失败"), + ACCOUNT_PASSWORD_ERROR ( 10004,"账号或密码错误"), + ACCOUNT_DISABLE (10005,"账号已被停用"), + IDENTIFIER_NOT_NULL (10006,"唯一标识不能为空"), + CAPTCHA_ERROR (10007,"验证码不正确"), + SUB_MENU_EXIST (10008,"先删除子菜单或按钮"), + PASSWORD_ERROR (10009,"原密码不正确"), + ACCOUNT_NOT_EXIST (10010,"账号不存在"), + SUPERIOR_DEPT_ERROR ( 10011,"上级部门选择错误"), + SUPERIOR_MENU_ERROR (10012,"上级菜单不能为自身"), + DATA_SCOPE_PARAMS_ERROR (10013,"数据权限接口，只能是Map类型参数"), + DEPT_SUB_DELETE_ERROR (10014,"请先删除下级部门"), + DEPT_USER_DELETE_ERROR (10015,"请先删除部门下的用户"), + JSON_FORMAT_ERROR (10016,"参数格式不正确，请使用JSON格式"), + SUPERIOR_REGION_ERROR (10017,"上级区域选择错误"), + REGION_SUB_DELETE_ERROR (10018,"请先删除下级区域"), + /*****************以上是框架自带的错误编码****************************************************/ + + SERVER_ERROR(8000, "服务器开小差了..."), CANNOT_JOIN_GROUP(8001, "只有认证党员和居民才可以加入小组，请选择您的身份"), CANNOT_CREATE_GROUP(8002, "只有党员和热心居民才能创建小组，请选择您的身份"), GROUP_ALREADY_EXISTED(8003,"您的组名已存在，请重新修改"), @@ -29,16 +54,26 @@ public enum EpmetErrorCode { this.msg = msg; } - public int getCode() { - return code; + public static String getMsg(Integer value) { + EpmetErrorCode[] businessModeEnums = values(); + for (EpmetErrorCode epmetErrorCodeEnum : businessModeEnums) { + if (epmetErrorCodeEnum.getCode()==value) { + return epmetErrorCodeEnum.getMsg(); + } + } + return null; + } + + public int getCode(){ + return this.code; } public void setCode(int code) { this.code = code; } - public String getMsg() { - return msg; + public String getMsg(){ + return this.msg; } public void setMsg(String msg) { diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenException.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenException.java index bb3684f41c..203acad9b0 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenException.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenException.java @@ -9,7 +9,6 @@ package com.epmet.commons.tools.exception; -import com.epmet.commons.tools.utils.MessageUtils; import org.apache.commons.lang3.StringUtils; /** @@ -20,24 +19,23 @@ import org.apache.commons.lang3.StringUtils; */ public class RenException extends RuntimeException { private static final long serialVersionUID = 1L; - private int code; private String msg; public RenException(int code) { this.code = code; - this.msg = MessageUtils.getMessage(code); + this.msg = EpmetErrorCode.getMsg(code); } public RenException(int code, String... params) { this.code = code; - this.msg = MessageUtils.getMessage(code, params); + this.msg = EpmetErrorCode.getMsg(code); } public RenException(int code, Throwable e) { super(e); this.code = code; - this.msg = MessageUtils.getMessage(code); + this.msg = EpmetErrorCode.getMsg(code); } public RenException(int code, Throwable e, String... params) { @@ -49,7 +47,7 @@ public class RenException extends RuntimeException { public RenException(int code, String msg){ this.code = code; if(StringUtils.isBlank(msg)){ - this.msg = MessageUtils.getMessage(code, msg); + this.msg = EpmetErrorCode.getMsg(code); }else{ this.msg = msg; } @@ -58,13 +56,13 @@ public class RenException extends RuntimeException { public RenException(String msg) { super(msg); - this.code = ErrorCode.INTERNAL_SERVER_ERROR; + this.code = EpmetErrorCode.SERVER_ERROR.getCode(); this.msg = msg; } public RenException(String msg, Throwable e) { super(msg, e); - this.code = ErrorCode.INTERNAL_SERVER_ERROR; + this.code = EpmetErrorCode.SERVER_ERROR.getCode(); this.msg = msg; } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenExceptionHandler.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenExceptionHandler.java index 6896d99dd5..b2936413d2 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenExceptionHandler.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenExceptionHandler.java @@ -47,29 +47,46 @@ public class RenExceptionHandler { /** * 处理自定义异常 + * "code": 8000, + * "msg": "服务器开小差了...", */ @ExceptionHandler(RenException.class) public Result handleRRException(RenException ex){ - Result result = new Result(); - result.error(ex.getCode(), ex.getMsg()); + logger.error(ExceptionUtils.getErrorStackTrace(ex)); + return new Result().error(); + } - return result; + /** + * 运行时异常拦截 + * "code": 8000, + * "msg": "服务器开小差了...", + */ + @ExceptionHandler(RuntimeException.class) + public Result handleRuntimeException(RuntimeException ex){ + logger.error(ExceptionUtils.getErrorStackTrace(ex)); + return new Result().error(); } + /** + * 处理自定义异常 + * "code": 10002, + * "msg": "数据库中已存在该记录", + */ @ExceptionHandler(DuplicateKeyException.class) public Result handleDuplicateKeyException(DuplicateKeyException ex){ - Result result = new Result(); - result.error(ErrorCode.DB_RECORD_EXISTS); - - return result; + logger.error(ExceptionUtils.getErrorStackTrace(ex)); + return new Result().error(ErrorCode.DB_RECORD_EXISTS); } + /** + * 异常 + * "code": 8000, + * "msg": "服务器开小差了...", + */ @ExceptionHandler(Exception.class) public Result handleException(Exception ex){ - logger.error(ex.getMessage(), ex); - - saveLog(ex); - + logger.error(ExceptionUtils.getErrorStackTrace(ex)); +// saveLog(ex); return new Result().error(); } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ModuleUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ModuleUtils.java index 4885e52063..0e13174032 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ModuleUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ModuleUtils.java @@ -37,7 +37,7 @@ public class ModuleUtils { String errorMessage = "Failure to connect " + serverName; String errorLog = errorMessage + "::[method]->{}::[params]->{}"; log.error(errorLog, methodName, JSON.toJSONString(params)); - return new Result().error(errorMessage); + return new Result().error(); } /** diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Result.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Result.java index 19446eb6a5..96e74eb64f 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Result.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Result.java @@ -8,7 +8,7 @@ package com.epmet.commons.tools.utils; -import com.epmet.commons.tools.exception.ErrorCode; +import com.epmet.commons.tools.exception.EpmetErrorCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -48,26 +48,46 @@ public class Result implements Serializable { return code == 0 ? true : false; } + /** + * 返回 + * "code": 8000, + * "msg": "服务器开小差了...", + */ public Result error() { - this.code = ErrorCode.INTERNAL_SERVER_ERROR; - this.msg = com.epmet.commons.tools.utils.MessageUtils.getMessage(this.code); + this.code = EpmetErrorCode.SERVER_ERROR.getCode(); + this.msg = EpmetErrorCode.getMsg(code); return this; } + /** + * 根据错误编码查询msg返回 + */ public Result error(int code) { this.code = code; - this.msg = com.epmet.commons.tools.utils.MessageUtils.getMessage(this.code); + this.msg = EpmetErrorCode.getMsg(code); return this; } + /** + * 传入错误编码+msg返回 + */ public Result error(int code, String msg) { this.code = code; this.msg = msg; return this; } + /** + * + * @param msg + * @return 此方法废弃，统一使用 + * logger.error(XXXX); + * throw new RenException(XXXX); + * XXXX定义常量里 + */ + @Deprecated public Result error(String msg) { - this.code = ErrorCode.INTERNAL_SERVER_ERROR; + this.code = EpmetErrorCode.INTERNAL_SERVER_ERROR.getCode(); this.msg = msg; return this; } diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java index 90b90b30e6..5949155e2b 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/controller/DemoController.java @@ -17,6 +17,7 @@ package com.epmet.controller; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.user.UserDetail; import com.epmet.commons.tools.utils.ExcelUtils; @@ -34,6 +35,8 @@ import com.epmet.dto.result.ValidCustomerResultDTO; import com.epmet.excel.DemoExcel; import com.epmet.service.DemoService; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -51,7 +54,7 @@ import java.util.Map; @RestController @RequestMapping("demo") public class DemoController { - + private static final Logger logger = LoggerFactory.getLogger(DemoController.class); @Autowired private DemoService demoService; @@ -124,7 +127,8 @@ public class DemoController { @GetMapping("/queryCustomInfo/{customerId}") public Result queryCustomInfo(@PathVariable("customerId") String customerId) { if (StringUtils.isBlank(customerId)) { - return new Result().error("customerId不能为空"); + logger.error("账号不存在"); + throw new RenException("customerId不能为空"); } return demoService.queryCustomerInfo(customerId); } @@ -139,7 +143,8 @@ public class DemoController { @GetMapping("/queryCustomInfoByCustomerId") public Result queryCustomInfoByCustomerId(@RequestParam("customerId") String customerId) { if (StringUtils.isBlank(customerId)) { - return new Result().error("customerId不能为空"); + logger.error("customerId不能为空"); + throw new RenException("customerId不能为空"); } return demoService.queryCustomInfoByCustomerId(customerId); } diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java index f2237070f4..1a8c985f55 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/service/impl/DemoServiceImpl.java @@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.user.UserDetail; import com.epmet.commons.tools.utils.ConvertUtils; @@ -39,6 +40,8 @@ import com.epmet.feign.OperCrmFeignClient; import com.epmet.redis.DemoRedis; import com.epmet.service.DemoService; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -57,7 +60,7 @@ import java.util.Map; */ @Service public class DemoServiceImpl extends BaseServiceImpl implements DemoService { - + private static final Logger logger = LoggerFactory.getLogger(DemoServiceImpl.class); @Autowired private DemoRedis demoRedis; @Autowired @@ -183,7 +186,8 @@ public class DemoServiceImpl extends BaseServiceImpl implem @Override public Result sendSmsCaptcha(String mobile) { if(StringUtils.isBlank(mobile)){ - return new Result().error("手机号不能为空"); + logger.error("手机号不能为空"); + throw new RenException("手机号不能为空"); } return messageFeignClient.sendSmsCaptcha(mobile); } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailTemplateController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailTemplateController.java index a1d46b26c2..550a83c112 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailTemplateController.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailTemplateController.java @@ -11,6 +11,7 @@ package com.epmet.controller; import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.annotation.LogOperation; import com.epmet.commons.tools.constant.Constant; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -26,6 +27,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; @@ -43,6 +46,7 @@ import java.util.Map; @RequestMapping("mailtemplate") @Api(tags="邮件模板") public class MailTemplateController { + private static final Logger logger = LoggerFactory.getLogger(MailTemplateController.class); @Autowired private SysMailTemplateService sysMailTemplateService; @Autowired @@ -134,8 +138,8 @@ public class MailTemplateController { if(flag){ return new Result(); } - - return new Result().error("邮件发送失败"); + logger.error("邮件发送失败"); + throw new RenException("邮件发送失败"); } } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java index 859138663e..75da5ccf9e 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java @@ -137,6 +137,6 @@ public class SysSmsServiceImpl extends BaseServiceImpl e.printStackTrace(); logger.error(String.format("短信验证码发送失败,手机号:%s。errorMessage:%s", mobile, e.getMessage())); } - return new Result().error(EpmetErrorCode.MESSAGE_SMS_SEND_ERROR.getCode(), EpmetErrorCode.MESSAGE_SMS_SEND_ERROR.getMsg()); + return new Result().error(EpmetErrorCode.MESSAGE_SMS_SEND_ERROR.getCode()); } } diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/impl/OssServiceImpl.java b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/impl/OssServiceImpl.java index 9e492044db..6ca5626490 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/impl/OssServiceImpl.java +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/impl/OssServiceImpl.java @@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.cloud.OssFactory; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.Constant; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.OssDao; @@ -21,6 +22,8 @@ import com.epmet.entity.OssEntity; import com.epmet.exception.ModuleErrorCode; import com.epmet.service.OssService; import org.apache.commons.io.FilenameUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -29,7 +32,7 @@ import java.util.Map; @Service public class OssServiceImpl extends BaseServiceImpl implements OssService { - + private static final Logger logger = LoggerFactory.getLogger(OssServiceImpl.class); @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -56,8 +59,8 @@ public class OssServiceImpl extends BaseServiceImpl implement url = OssFactory.build().uploadSuffix(file.getBytes(), extension); } catch (IOException e) { e.printStackTrace(); - return new Result().error("图片上传异常"); - + logger.error("图片上传异常"); + throw new RenException("图片上传异常"); } //保存文件信息 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java index 467ff9449b..1e31399e1d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java @@ -23,6 +23,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; @@ -36,6 +37,8 @@ import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedAuditFormD import com.epmet.service.CustomerStaffGridService; import com.epmet.util.ModuleConstant; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -52,7 +55,7 @@ import java.util.Map; */ @Service public class CustomerStaffGridServiceImpl extends BaseServiceImpl implements CustomerStaffGridService { - + private static final Logger logger = LoggerFactory.getLogger(CustomerStaffGridServiceImpl.class); @Autowired private CustomerStaffGridRedis customerStaffGridRedis; @Autowired @@ -118,7 +121,8 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl getGroupSummarize(GroupSummarizeFormDTO groupSummarizeFormDTO) { GroupSummarizeResultDTO groupSummarizeResultDTO = baseDao.selectGroupSummarize(groupSummarizeFormDTO); if (null == groupSummarizeResultDTO) { - return new Result().error(ModuleConstant.GETGROUPSUMMARIZE_FAILED); + logger.error(ModuleConstant.GETGROUPSUMMARIZE_FAILED); + return new Result().error(); } //获取组长信息 Result groupLeaderUserInfo = this.getGroupLeaderUserInfo(groupSummarizeFormDTO.getGroupId()); @@ -298,7 +303,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl resiGroupEntityList = this.getResiGroupEntityList(applyCreateGroupFormDTO); if (null != resiGroupEntityList && resiGroupEntityList.size() > 0) { - return new Result().error(EpmetErrorCode.GROUP_ALREADY_EXISTED.getCode(),EpmetErrorCode.GROUP_ALREADY_EXISTED.getMsg()); + return new Result().error(EpmetErrorCode.GROUP_ALREADY_EXISTED.getCode()); } //2、插入一条待审核的组信息 ResiGroupEntity resiGroupEntity = this.structureResiGroupEntity(applyCreateGroupFormDTO); @@ -372,10 +377,12 @@ public class ResiGroupServiceImpl extends BaseServiceImpl result = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO); if (!result.success() || null == result.getData() || StringUtils.isBlank(result.getData().getRegMobile())) { logger.info("居民注册信息查询失败"); - return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(),EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg()); + return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode()); } return new Result(); } @@ -410,17 +417,19 @@ public class ResiGroupServiceImpl extends BaseServiceImpl implements ResiGroupStatisticalService { - + private static final Logger logger = LoggerFactory.getLogger(ResiGroupStatisticalServiceImpl.class); @Autowired private ResiGroupServiceImpl resiGroupServiceImpl; @Autowired @@ -125,8 +129,8 @@ public class ResiGroupStatisticalServiceImpl extends BaseServiceImpl> resultList = epmetUserFeignClient.getUserRoleInfo(userRoleFormDTO); if (!resultList.success()) { - result.error(ModuleErrorCode.DATA_ACQUISITION_FAILED); - return result; + logger.error(ModuleErrorCode.DATA_ACQUISITION_FAILED); + throw new RenException(ModuleErrorCode.DATA_ACQUISITION_FAILED); } for (UserRoleResultDTO userRole : resultList.getData()) { if (EpmetRoleKeyConstant.WARMHEARTED.equals(userRole.getRoleKey())) { diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java index 81c857b950..c2119db769 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java @@ -25,6 +25,7 @@ import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; @@ -164,7 +165,8 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl().error(ModuleConstant.CANNOT_SHARED); + logger.error(ModuleConstant.CANNOT_SHARED); + throw new RenException(ModuleConstant.CANNOT_SHARED); } //3、插入一条邀请记录 GroupInvitationEntity groupInvitationEntity = new GroupInvitationEntity(); @@ -317,7 +319,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl TopicConstant.MAX_NUMBER_OF_COMMENT){ - logger.warn(ModuleConstant.COMMENT_NUMBER_OF_WORDS_EXCEEDED); - return new Result().error(ModuleConstant.COMMENT_NUMBER_OF_WORDS_EXCEEDED); + logger.error(ModuleConstant.COMMENT_NUMBER_OF_WORDS_EXCEEDED); + throw new RenException(ModuleConstant.COMMENT_NUMBER_OF_WORDS_EXCEEDED); } ResiTopicCommentEntity comment = ConvertUtils.sourceToTarget(resiCommentFormDTO,ResiTopicCommentEntity.class); comment.setStatus(TopicConstant.PUBLISHMENT); diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index d87d1125d6..2b7898551b 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.security.dto.TokenDto; @@ -175,7 +176,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl TopicConstant.MAX_NUMBER_OF_CONTENT){ //内容超过最大限制 - return new Result().error(ModuleConstant.TOPIC_CONTENT_NUMBER_OF_WORDS_EXCEEDED); + logger.error(ModuleConstant.TOPIC_CONTENT_NUMBER_OF_WORDS_EXCEEDED); + throw new RenException(ModuleConstant.TOPIC_CONTENT_NUMBER_OF_WORDS_EXCEEDED); } ResiTopicEntity topic = ConvertUtils.sourceToTarget(resiTopicPublishFormDTO,ResiTopicEntity.class); topic.setCreatedBy(tokenDto.getUserId()); @@ -200,8 +203,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl 0){ ResiTopicAttachmentEntity attachment = new ResiTopicAttachmentEntity(); @@ -230,8 +233,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl statistical = resiGroupStatisticalDao.selectList(wrapper); if(null != statistical && statistical.size() >= NumConstant.ONE){ if(statistical.size() != NumConstant.ONE){ - logger.warn(ModuleConstant.GROUP_STASTICAL_NOT_SINGLE); - return new Result().error(ModuleConstant.GROUP_STASTICAL_NOT_SINGLE); + logger.error(ModuleConstant.GROUP_STASTICAL_NOT_SINGLE); + throw new RenException(ModuleConstant.GROUP_STASTICAL_NOT_SINGLE); }else{ ResiGroupStatisticalEntity statistical2Update = new ResiGroupStatisticalEntity(); statistical2Update.setId(statistical.get(NumConstant.ZERO).getId()); @@ -241,8 +244,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl> getLatestTopics(TokenDto tokenDto, String groupId) { if (null == tokenDto) { - return new Result().error(ModuleConstant.USER_NOT_NULL); + logger.error(ModuleConstant.USER_NOT_NULL); + throw new RenException(ModuleConstant.USER_NOT_NULL); } if (StringUtils.isBlank(groupId)) { return new Result>().error(); @@ -301,7 +305,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl> getPastTopicList(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO) { if (null == tokenDto) { - return new Result().error(ModuleConstant.USER_NOT_NULL); + logger.error(ModuleConstant.USER_NOT_NULL); + throw new RenException(ModuleConstant.USER_NOT_NULL); } //1.查询历史话题列表 @@ -340,7 +345,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl topicIds) { if(null == topicIds || topicIds.size() <= 0){ - return new Result().error(ModuleConstant.TOPIC_ID_LIST_NOT_NULL); + logger.error(ModuleConstant.TOPIC_ID_LIST_NOT_NULL); + throw new RenException(ModuleConstant.TOPIC_ID_LIST_NOT_NULL); } //1.1拿到组Id @@ -484,8 +491,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl implements StrangerAccessRecordService { - private static final Logger log = LoggerFactory.getLogger(StrangerAccessRecordServiceImpl.class); + private static final Logger logger = LoggerFactory.getLogger(StrangerAccessRecordServiceImpl.class); @Autowired private StrangerAccessRecordDao strangerAccessRecordDao; @Autowired @@ -205,7 +206,8 @@ public class StrangerAccessRecordServiceImpl extends BaseServiceImpl().error(StrangerResiGuideConstant.PARAMETER_EXCEPTION); + logger.error(StrangerResiGuideConstant.PARAMETER_EXCEPTION); + throw new RenException(StrangerResiGuideConstant.PARAMETER_EXCEPTION); } //token里边有所属端 userId这些参数 前台传递customerID和gridId /*//2:调用epmet-user服务查询数据 新建网格记录数据 diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java index 7de59e3277..a0925b8f13 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java @@ -1,6 +1,7 @@ package com.epmet.modules.grid.service.impl; import com.epmet.commons.tools.constant.AppClientConstant; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.result.LatestGridInfoResultDTO; @@ -8,6 +9,8 @@ import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.grid.service.ResiMineGridService; import com.epmet.modules.utils.ModuleConstant; import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -18,7 +21,7 @@ import org.springframework.stereotype.Service; */ @Service public class ResiMineGridServiceImpl implements ResiMineGridService { - + private Logger logger = LoggerFactory.getLogger(getClass()); @Autowired private EpmetUserFeignClient epmetUserFeignClient; @@ -32,10 +35,12 @@ public class ResiMineGridServiceImpl implements ResiMineGridService { @Override public Result getLatestGridInfo(TokenDto tokenDto) { if (null == tokenDto || StringUtils.isBlank(tokenDto.getUserId())) { - return new Result().error(ModuleConstant.USER_NOT_NULL); + logger.error(ModuleConstant.USER_NOT_NULL); + throw new RenException(ModuleConstant.USER_NOT_NULL); } if(!AppClientConstant.APP_RESI.equals(tokenDto.getApp())){ - return new Result().error(ModuleConstant.FOR_RESI_CALL); + logger.error(ModuleConstant.FOR_RESI_CALL); + throw new RenException(ModuleConstant.FOR_RESI_CALL); } return epmetUserFeignClient.getLatestGridInfoByUserId(tokenDto.getUserId()); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index 2b0ea84e5d..13597d79a5 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -110,17 +110,13 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService partyMemberInfoParam.setCustomerId(fromDTO.getCustomerId()); PartymemberInfoDTO partyMemberInfoResult = partymemberInfoService.getPartyMemberInfoByMobile(partyMemberInfoParam); if (null != partyMemberInfoResult) { - result.setCode(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getCode()); - result.setMsg(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getMsg()); - return result; + return new Result().error(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getCode()); } //生成短信验证码 Map message = (Map) messageFeignClient.sendSmsCaptcha(fromDTO.getMobile()).getData(); if (null == message) { - result.setCode(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getCode()); - result.setMsg(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getMsg()); - return result; + return new Result().error(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getCode()); } //删除旧验证码 partyMemberInfoRedis.deleteUserMobileCodeByPattern(fromDTO.getUserId(), fromDTO.getMobile()); @@ -146,9 +142,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService if (null == code) { saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_FAILED); - result.setCode(EpmetErrorCode.MOBILE_CODE_ERROR.getCode()); - result.setMsg(EpmetErrorCode.MOBILE_CODE_ERROR.getMsg()); - return result; + return new Result().error(EpmetErrorCode.MOBILE_CODE_ERROR.getCode()); } //获取党员基本信息 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java index cb1bd5de80..cae8a76100 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java @@ -26,6 +26,7 @@ import com.epmet.commons.tools.constant.EpmetRoleKeyConstant; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; @@ -34,6 +35,7 @@ import com.epmet.dto.UserRoleDTO; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.modules.feign.EpmetUserFeignClient; +import com.epmet.modules.utils.ModuleConstant; import com.epmet.modules.warmhearted.constant.ResiWarmheartedVisitConstant; import com.epmet.modules.warmhearted.dao.ResiWarmheartedApplyDao; import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity; @@ -67,7 +69,7 @@ import org.slf4j.LoggerFactory; @Service public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl implements ResiWarmheartedApplyService { - private static final Logger log = LoggerFactory.getLogger(ResiWarmheartedApplyServiceImpl.class); + private static final Logger logger = LoggerFactory.getLogger(ResiWarmheartedApplyServiceImpl.class); @Autowired private ResiWarmheartedApplyRedis resiWarmheartedApplyRedis; @Autowired @@ -146,7 +148,7 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl implements GridLatestService { - + private Logger logger = LoggerFactory.getLogger(getClass()); @Autowired private GridLatestRedis gridLatestRedis; @Autowired @@ -147,7 +150,8 @@ public class GridLatestServiceImpl extends BaseServiceImpl getLatestGridInfoByUserId(String userId) { if(StringUtils.isBlank(userId)){ - return new Result().error(GridVisitedConstant.USER_ID_NOTNULL); + logger.error(GridVisitedConstant.USER_ID_NOTNULL); + throw new RenException(GridVisitedConstant.USER_ID_NOTNULL); } LatestGridInfoResultDTO latestGridInfoResultDTO = baseDao.selectLatestGridInfoByUserId(userId); if (null == latestGridInfoResultDTO) { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java index dcb4d7d174..4faed63857 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridVisitedServiceImpl.java @@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; @@ -54,8 +55,7 @@ import java.util.Map; */ @Service public class GridVisitedServiceImpl extends BaseServiceImpl implements GridVisitedService { - - private static final Logger log = LoggerFactory.getLogger(GridVisitedServiceImpl.class); + private static final Logger logger = LoggerFactory.getLogger(GridVisitedServiceImpl.class); @Autowired private GovOrgFeignClient govOrgFeignClient; @Autowired @@ -131,19 +131,19 @@ public class GridVisitedServiceImpl extends BaseServiceImpl gridDTO = govOrgFeignClient.getCustomerGridByGridId(dto); if (!gridDTO.success()) { - log.warn(GridVisitedConstant.QUERY_EXCEPTION); - result.error(GridVisitedConstant.QUERY_EXCEPTION); + logger.error(GridVisitedConstant.QUERY_EXCEPTION); + throw new RenException(GridVisitedConstant.QUERY_EXCEPTION); } CustomerGridDTO customerGridDTO = gridDTO.getData(); //2:网格访问记录表新增数据 if (!saveGridVisited(visitedFormDTO, customerGridDTO)) { - log.warn(GridVisitedConstant.SAVE_VISITED); - result.error(GridVisitedConstant.SAVE_VISITED); + logger.error(GridVisitedConstant.SAVE_VISITED); + throw new RenException(GridVisitedConstant.SAVE_VISITED); } //3：最近访问网格表新增数据 if (!gridLatestService.saveGridLatest(visitedFormDTO, customerGridDTO)) { - log.warn(GridVisitedConstant.SAVE_LATEST); - result.error(GridVisitedConstant.SAVE_LATEST); + logger.error(GridVisitedConstant.SAVE_LATEST); + throw new RenException(GridVisitedConstant.SAVE_LATEST); } return result; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index fe8b7cde2a..3bf4faf749 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -156,17 +156,13 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl map = (Map) result.getData(); if (null == map || null == map.get("code")) { - result.setCode(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getCode()); - result.setMsg(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getMsg()); - return result; + return new Result().error(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getCode()); } //4:删除缓存中可能存在的旧验证码 userResiInfoRedis.deleteOldUserMobileCode(verificationCodeFormDTO.getUserId(), verificationCodeFormDTO.getMobile()); From f8759c58c9ee8f59d0f0140e215e2a27076650a9 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 14 Apr 2020 14:48:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E4=BF=AE=E6=94=B9v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/exception/EpmetErrorCode.java | 24 --- .../commons/tools/exception/RenException.java | 139 ++++++++++-------- .../com/epmet/commons/tools/utils/Result.java | 10 +- .../com/epmet/exception/ModuleErrorCode.java | 4 - .../modules/exception/ModuleErrorCode.java | 6 - .../impl/ResiGroupStatisticalServiceImpl.java | 12 +- .../impl/ResiGroupMemberServiceImpl.java | 24 +-- .../epmet/modules/utils/ModuleConstant.java | 6 + 8 files changed, 110 insertions(+), 115 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index e29925f033..5439a91c14 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -6,30 +6,6 @@ package com.epmet.commons.tools.exception; * @Description: */ public enum EpmetErrorCode { - /*****************以下是框架自带的异常编码s****************************************************/ - INTERNAL_SERVER_ERROR (500,"服务器内部异常"), - UNAUTHORIZED (401,"未授权"), - FORBIDDEN (403,"拒绝访问，没有权限"), - NOT_NULL (10001,"{0}不能为空"), - DB_RECORD_EXISTS ( 10002,"数据库中已存在该记录"), - PARAMS_GET_ERROR ( 10003,"获取参数失败"), - ACCOUNT_PASSWORD_ERROR ( 10004,"账号或密码错误"), - ACCOUNT_DISABLE (10005,"账号已被停用"), - IDENTIFIER_NOT_NULL (10006,"唯一标识不能为空"), - CAPTCHA_ERROR (10007,"验证码不正确"), - SUB_MENU_EXIST (10008,"先删除子菜单或按钮"), - PASSWORD_ERROR (10009,"原密码不正确"), - ACCOUNT_NOT_EXIST (10010,"账号不存在"), - SUPERIOR_DEPT_ERROR ( 10011,"上级部门选择错误"), - SUPERIOR_MENU_ERROR (10012,"上级菜单不能为自身"), - DATA_SCOPE_PARAMS_ERROR (10013,"数据权限接口，只能是Map类型参数"), - DEPT_SUB_DELETE_ERROR (10014,"请先删除下级部门"), - DEPT_USER_DELETE_ERROR (10015,"请先删除部门下的用户"), - JSON_FORMAT_ERROR (10016,"参数格式不正确，请使用JSON格式"), - SUPERIOR_REGION_ERROR (10017,"上级区域选择错误"), - REGION_SUB_DELETE_ERROR (10018,"请先删除下级区域"), - /*****************以上是框架自带的错误编码****************************************************/ - SERVER_ERROR(8000, "服务器开小差了..."), CANNOT_JOIN_GROUP(8001, "只有认证党员和居民才可以加入小组，请选择您的身份"), CANNOT_CREATE_GROUP(8002, "只有党员和热心居民才能创建小组，请选择您的身份"), diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenException.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenException.java index 203acad9b0..b775eb8f9a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenException.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenException.java @@ -1,14 +1,15 @@ /** * Copyright (c) 2018 人人开源 All rights reserved. - * + *

* https://www.renren.io - * + *

* 版权所有，侵权必究！ */ package com.epmet.commons.tools.exception; +import com.epmet.commons.tools.utils.MessageUtils; import org.apache.commons.lang3.StringUtils; /** @@ -18,68 +19,82 @@ import org.apache.commons.lang3.StringUtils; * @since 1.0.0 */ public class RenException extends RuntimeException { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; private int code; - private String msg; - - public RenException(int code) { - this.code = code; - this.msg = EpmetErrorCode.getMsg(code); - } - - public RenException(int code, String... params) { - this.code = code; - this.msg = EpmetErrorCode.getMsg(code); - } - - public RenException(int code, Throwable e) { - super(e); - this.code = code; - this.msg = EpmetErrorCode.getMsg(code); - } - - public RenException(int code, Throwable e, String... params) { - super(e); - this.code = code; - - } - - public RenException(int code, String msg){ - this.code = code; - if(StringUtils.isBlank(msg)){ - this.msg = EpmetErrorCode.getMsg(code); - }else{ - this.msg = msg; - } - } - - - public RenException(String msg) { - super(msg); - this.code = EpmetErrorCode.SERVER_ERROR.getCode(); - this.msg = msg; - } - - public RenException(String msg, Throwable e) { - super(msg, e); - this.code = EpmetErrorCode.SERVER_ERROR.getCode(); - this.msg = msg; - } + private String msg; - public String getMsg() { - return msg; - } - - public void setMsg(String msg) { - this.msg = msg; - } - - public int getCode() { - return code; - } + public RenException(int code) { + this.code = code; + this.msg = EpmetErrorCode.getMsg(code); + if (StringUtils.isBlank(this.msg)) { + this.msg = MessageUtils.getMessage(code); + } + } - public void setCode(int code) { - this.code = code; - } + public RenException(int code, String... params) { + this.code = code; + this.msg = EpmetErrorCode.getMsg(code); + if (StringUtils.isBlank(this.msg)) { + this.msg = MessageUtils.getMessage(code, params); + } + } + + public RenException(int code, Throwable e) { + super(e); + this.code = code; + this.msg = EpmetErrorCode.getMsg(code); + if (StringUtils.isBlank(this.msg)) { + this.msg = MessageUtils.getMessage(code); + } + } + + public RenException(int code, Throwable e, String... params) { + super(e); + this.code = code; + + } + + public RenException(int code, String msg) { + this.code = code; + if (StringUtils.isBlank(msg)) { + this.msg = EpmetErrorCode.getMsg(code); + if (StringUtils.isBlank(this.msg)) { + this.msg = MessageUtils.getMessage(code, msg); + } + } else { + this.msg = msg; + } + } + + + public RenException(String msg) { + super(msg); +// this.code = ErrorCode.INTERNAL_SERVER_ERROR; + this.code = EpmetErrorCode.SERVER_ERROR.getCode(); + this.msg = msg; + } + + public RenException(String msg, Throwable e) { + super(msg, e); +// this.code = ErrorCode.INTERNAL_SERVER_ERROR; + this.code = EpmetErrorCode.SERVER_ERROR.getCode(); + this.msg = msg; + } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Result.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Result.java index 96e74eb64f..f97f6f48db 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Result.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/Result.java @@ -9,8 +9,10 @@ package com.epmet.commons.tools.utils; import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.ErrorCode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import org.apache.commons.lang3.StringUtils; import java.io.Serializable; @@ -56,6 +58,9 @@ public class Result implements Serializable { public Result error() { this.code = EpmetErrorCode.SERVER_ERROR.getCode(); this.msg = EpmetErrorCode.getMsg(code); + if (StringUtils.isBlank(this.msg)) { + this.msg = com.epmet.commons.tools.utils.MessageUtils.getMessage(this.code); + } return this; } @@ -65,6 +70,9 @@ public class Result implements Serializable { public Result error(int code) { this.code = code; this.msg = EpmetErrorCode.getMsg(code); + if (StringUtils.isBlank(this.msg)) { + this.msg = com.epmet.commons.tools.utils.MessageUtils.getMessage(this.code); + } return this; } @@ -87,7 +95,7 @@ public class Result implements Serializable { */ @Deprecated public Result error(String msg) { - this.code = EpmetErrorCode.INTERNAL_SERVER_ERROR.getCode(); + this.code = ErrorCode.INTERNAL_SERVER_ERROR; this.msg = msg; return this; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/exception/ModuleErrorCode.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/exception/ModuleErrorCode.java index dc2e3e93cc..f7aba2c2c7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/exception/ModuleErrorCode.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/exception/ModuleErrorCode.java @@ -13,8 +13,4 @@ import com.epmet.commons.tools.exception.ErrorCode; */ public interface ModuleErrorCode extends ErrorCode { - int ARGS_NOT_ALLOW_NULL_ERROR = 100019001; - - int NOT_STANDARD_AREA_CODE_ERROR = 100019002; - } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java index 4a631c0125..4daeeb6450 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java @@ -22,10 +22,4 @@ import com.epmet.commons.tools.exception.ErrorCode; */ public interface ModuleErrorCode extends ErrorCode { - String DATA_ACQUISITION_FAILED = "数据库数据获取失败"; - - String DELETE_FAILED = "组成员删除失败"; - - String SLIENT_FAILED = "组成员禁言失败"; - } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java index a8c0a5cdc2..4a9d0ecbbd 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java @@ -129,8 +129,8 @@ public class ResiGroupStatisticalServiceImpl extends BaseServiceImpl> resultList = epmetUserFeignClient.getUserRoleInfo(userRoleFormDTO); if (!resultList.success()) { - logger.error(ModuleErrorCode.DATA_ACQUISITION_FAILED); - throw new RenException(ModuleErrorCode.DATA_ACQUISITION_FAILED); + logger.error(ModuleConstant.DATA_ACQUISITION_FAILED); + throw new RenException(ModuleConstant.DATA_ACQUISITION_FAILED); } for (UserRoleResultDTO userRole : resultList.getData()) { if (EpmetRoleKeyConstant.WARMHEARTED.equals(userRole.getRoleKey())) { diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java index 202d34de9c..c262320f1e 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java @@ -444,17 +444,17 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl