Merge branch 'dev_plugins' into dev_temp

# Conflicts: # epmet-auth/pom.xml # epmet-gateway/pom.xml # epmet-module/data-report/data-report-server/pom.xml # epmet-module/data-statistical/data-statistical-server/pom.xml # epmet-module/epmet-common-service/common-service-server/pom.xml # epmet-module/epmet-job/epmet-job-server/pom.xml # epmet-module/epmet-point/epmet-point-server/pom.xml # epmet-module/epmet-third/epmet-third-server/pom.xml # epmet-module/gov-org/gov-org-server/pom.xml # epmet-module/gov-project/gov-project-server/pom.xml # epmet-module/oper-customize/oper-customize-server/pom.xml # epmet-module/resi-mine/resi-mine-server/pom.xml # epmet-module/resi-partymember/resi-partymember-server/pom.xml # epmet-user/epmet-user-server/pom.xml
5 years ago · 6dc69d00e4
19 changed files with 36 additions and 38 deletions
--- a/epmet-auth/deploy/docker-compose-prod.yml
+++ b/epmet-auth/deploy/docker-compose-prod.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-auth-server:
    container_name: epmet-auth-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.69
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.70
    ports:
      - "8081:8081"
    network_mode: host # 使用现有网络
--- a/epmet-gateway/deploy/docker-compose-prod.yml
+++ b/epmet-gateway/deploy/docker-compose-prod.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-gateway-server:
    container_name: epmet-gateway-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.33
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.36
    ports:
      - "8080:8080"
    network_mode: host # 使用现有网络
--- a/epmet-gateway/src/main/resources/bootstrap.yml
+++ b/epmet-gateway/src/main/resources/bootstrap.yml
@ -442,8 +442,8 @@ epmet:
  externalOpenUrls:
    - /data/report/**
    - /data/stats/**
+    - /epmet/ext/**
    - /epmetuser/customerstaff/customerlist
-
  swaggerUrls:

 jwt:
--- a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  data-report-server:
    container_name: data-report-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.37
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.43
    ports:
      - "8108:8108"
    network_mode: host # 使用现有网络
--- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  data-statistical-server:
    container_name: data-statistical-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.49
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.56
    ports:
      - "8108:8108"
    network_mode: host # 使用现有网络
--- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  common-service-server:
    container_name: common-service-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.17
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.23
    ports:
      - "8103:8103"
    network_mode: host # 使用现有网络
--- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml
+++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml
@ -26,11 +26,11 @@
            <artifactId>epmet-ext-client</artifactId>
            <version>2.0.0</version>
        </dependency>
-        <dependency>
+        <!--<dependency>
            <groupId>com.epmet</groupId>
            <artifactId>epmet-commons-extapp-auth</artifactId>
            <version>2.0.0</version>
-        </dependency>
+        </dependency>-->
        <dependency>
            <groupId>com.epmet</groupId>
            <artifactId>epmet-commons-tools</artifactId>
--- a/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/controller/OpenUpController.java
+++ b/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/controller/OpenUpController.java
@ -1,7 +1,6 @@
 package com.epmet.controller;


-import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
@ -38,7 +37,7 @@ public class OpenUpController {
     * @author zxc
     * @date 2020/8/13 9:42 上午
     */
-    @ExternalAppRequestAuth
+    //@ExternalAppRequestAuth
    @PostMapping("staffsingrid")
    public Result<List<StaffSinGridResultDTO>> staffSinGrid(@RequestBody StaffSinGridFormDTO formDTO){
        ValidatorUtils.validateEntity(formDTO, StaffSinGridFormDTO.StaffSinGrid.class);
@ -51,7 +50,7 @@ public class OpenUpController {
     * @author zxc
     * @date 2020/8/13 9:51 上午
     */
-    @ExternalAppRequestAuth
+    //@ExternalAppRequestAuth
    @PostMapping("staffsindept")
    public Result<List<StaffSinDeptResultDTO>> staffSinDept(@RequestBody StaffSinDeptFormDTO formDTO){
        ValidatorUtils.validateEntity(formDTO, StaffSinDeptFormDTO.StaffSinDept.class);
@ -64,7 +63,7 @@ public class OpenUpController {
     * @author zxc
     * @date 2020/8/17 9:59 上午
     */
-    @ExternalAppRequestAuth
+    //@ExternalAppRequestAuth
    @PostMapping("staffsinagency")
    public Result<List<StaffSinAgencyResultDTO>> staffSinAgency(@RequestBody StaffSinAgencyFormDTO formDTO){
        ValidatorUtils.validateEntity(formDTO, StaffSinAgencyFormDTO.StaffSinAgency.class);
@ -78,7 +77,7 @@ public class OpenUpController {
     * @author wangc
     * @date 2020.08.17 10:30
     **/
-    @ExternalAppRequestAuth
+    //@ExternalAppRequestAuth
    @PostMapping("staffinfo")
    public Result<ExtStaffInfoResultDTO> staffInfo(@LoginUser TokenDto token){
        CommonStaffIdFormDTO commonStaffIdFormDTO = new CommonStaffIdFormDTO();
@ -94,7 +93,7 @@ public class OpenUpController {
     * @author wangc
     * @date 2020.08.17 17:30
     **/
-    @ExternalAppRequestAuth
+    //@ExternalAppRequestAuth
    @PostMapping("permission")
    Result<ExtStaffPermissionResultDTO> staffPermissionExt(@RequestBody CommonStaffIdFormDTO commonStaffIdFormDTO){
        ValidatorUtils.validateEntity(commonStaffIdFormDTO, CommonStaffIdFormDTO.StaffIdGroup.class);
--- a/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/controller/OpenUpUserController.java
+++ b/epmet-module/epmet-ext/epmet-ext-server/src/main/java/com/epmet/controller/OpenUpUserController.java
@ -1,6 +1,5 @@
 package com.epmet.controller;

-import com.epmet.commons.extappauth.annotation.ExternalAppRequestAuth;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
@ -33,7 +32,7 @@ public class OpenUpUserController {
     * @author wangc
     * @date 2020.08.17 10:30
     **/
-    @ExternalAppRequestAuth
+    //@ExternalAppRequestAuth
    @PostMapping("userinfo")
    Result<ExtUserInfoResultDTO> userInfo(@LoginUser TokenDto token){
        CommonUserIdFormDTO userParam = new CommonUserIdFormDTO();
--- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-job-server:
    container_name: epmet-job-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.25
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.26
    ports:
      - "8084:8084"
    network_mode: host # 使用现有网络
--- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-point-server:
    container_name: epmet-point-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-point-server:0.0.40
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-point-server:0.0.42
    ports:
      - "8112:8112"
    network_mode: host # 使用现有网络
--- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-third-server:
    container_name: epmet-third-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.141
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.147
    ports:
      - "8110:8110"
    network_mode: host # 使用现有网络
--- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  gov-org-server:
    container_name: gov-org-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.88
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.91
    ports:
      - "8092:8092"
    network_mode: host # 使用现有网络
--- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  gov-project-server:
    container_name: gov-project-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.43
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.45
    ports:
      - "8102:8102"
    network_mode: host # 使用现有网络
--- a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  oper-customize-server:
    container_name: oper-customize-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.43
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:0.3.49
    ports:
      - "8089:8089"
    network_mode: host # 使用现有网络
--- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  resi-mine-server:
    container_name: resi-mine-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.40
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.42
    ports:
      - "8094:8094"
    network_mode: host # 使用现有网络
--- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  resi-partymember-server:
    container_name: resi-partymember-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.57
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.58
    ports:
      - "8096:8096"
    network_mode: host # 使用现有网络
--- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
+++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml
@ -2,7 +2,7 @@ version: "3.7"
 services:
  epmet-user-server:
    container_name: epmet-user-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.124
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.129
    ports:
      - "8087:8087"
    network_mode: host # 不会创建新的网络
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml
@ -87,20 +87,20 @@
    <!-- 查询用户的权限 -->
    <select id="getRoleInfoList" resultType="com.epmet.dto.result.RoleResultDTO">
        SELECT
-            gsr.role_key AS roleKey,
-            gsr.role_name AS roleName,
-            sr.staff_id AS userId
+        gsr.role_key AS roleKey,
+        gsr.role_name AS roleName,
+        sr.staff_id AS userId
        FROM
-            gov_staff_role gsr
-            LEFT JOIN staff_role sr ON sr.role_id = gsr.id
+        gov_staff_role gsr
+        LEFT JOIN staff_role sr ON sr.role_id = gsr.id
        WHERE
-            gsr.del_flag = 0
-            AND sr.del_flag = 0
-            AND
-            (
-                <foreach collection="userIds" item="userId" separator="OR">
-                    sr.staff_id = #{userId}
-                </foreach>
-            )
+        gsr.del_flag = 0
+        AND sr.del_flag = 0
+        AND
+        (
+            <foreach collection="userIds" item="userId" separator="OR">
+                sr.staff_id = #{userId}
+            </foreach>
+        )
    </select>
 </mapper>