Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-auth into developer

gic-platform-auth-api/src/main/java/com/gic/auth/constant/GicVersionEnum.java

-package com.gic.auth.constant;
-/**
- * gic版本
- * @ClassName: GicVersionEnum

- * @Description: 

- * @author guojuxing

- * @date 2019/9/18 10:26 AM

- */
-public enum GicVersionEnum {
-    NORMAL(1, "标准版"),
-    CLIQUE(2, "集团版");
-
-    private int code;
-    private String message;
-
-    private GicVersionEnum(int code, String message) {
-        this.code = code;
-        this.message = message;
-    }
-
-    public static String getMessageByCode(Integer code) {
-        if (code == null) {
-            return "--";
-        }
-        for (GicVersionEnum gicVersionEnum : values()) {
-            if (gicVersionEnum.code == code.intValue()) {
-                return gicVersionEnum.getMessage();
-            }
-        }
-        return "--";
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public void setCode(int code) {
-        this.code = code;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-}

gic-platform-auth-api/src/main/java/com/gic/auth/service/MenuApiService.java

@@ -9,6 +9,8 @@ import com.gic.auth.qo.MenuListQO;
 import com.gic.auth.qo.MenuOperationItemListQO;
 
 import java.util.List;
+import java.util.Map;
+
 /**
  * 权限树
  * @ClassName: MenuApiService

@@ -256,4 +258,12 @@ public interface MenuApiService {
      * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.AuthItemListDTO>>

     
 */
     ServiceResponse<List<AuthItemListDTO>> listAuthItemByMenuId(Integer menuId);
+    /**
+     * 获取gic基础服务的版本列表数据
+     * @Title: getGicDefaultVersion

+     * @Description:
+    
 * @author guojuxing 

+     * @return  com.gic.api.base.commons.ServiceResponse<java.util.Map<java.lang.String,java.lang.String>>

+    
 */
+    ServiceResponse<Map<String, String>> getGicDefaultVersion();
 }

gic-platform-auth-api/src/main/java/com/gic/auth/service/UserApiService.java

@@ -23,6 +23,16 @@ public interface UserApiService {
     ServiceResponse<Integer> saveUser(UserDTO userDTO);
 
     /**
+     * 新增超级用户
+     * @Title: saveAdmin

+     * @Description:
+    
 * @author guojuxing
+     * @param userDTO

+     * @return  com.gic.api.base.commons.ServiceResponse<java.lang.Integer>

+    
 */
+    ServiceResponse<Integer> saveAdmin(UserDTO userDTO);
+
+    /**
      * 编辑
      * @param userDTO
      * @return

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/AuditorApiServiceImpl.java

@@ -158,7 +158,7 @@ public class AuditorApiServiceImpl implements AuditorApiService {
             String codeUrl = this.getTempQrCodeUrl(auditorId);
             auditorDTO.setHeadUrl(codeUrl);
         } else {
-            ServiceResponse<ServiceUserDTO> service = this.serviceUserApiService.getByOpenid(auditorDTO.getOpenid());
+            ServiceResponse<ServiceUserDTO> service = this.serviceUserApiService.getByOpenid(auditorDTO.getOpenid(), auditorDTO.getEnterpriseId());
             if (service.isSuccess()) {
                 ServiceUserDTO userDTO = service.getResult();
                 String headUrl = userDTO.getHeadUrl();

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/MenuApiServiceImpl.java

@@ -2,6 +2,7 @@ package com.gic.auth.service.outer.impl;
 
 import java.util.*;
 
+import com.gic.open.api.service.ServeApiService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -50,6 +51,8 @@ public class MenuApiServiceImpl implements MenuApiService {
     private MenuRoleService menuRoleService;
     @Autowired
     private AppTokenApiService appTokenApiService;
+    @Autowired
+    private ServeApiService serveApiService;
 
     @Override
     public ServiceResponse<List<MenuDTO>> listByMenuIdList(List<Integer> menuIdList) {
@@ -406,6 +409,30 @@ public class MenuApiServiceImpl implements MenuApiService {
         return ServiceResponse.success(authItemList);
     }
 
+    /**
+     * 查询gic基础服务版本列表数据
+     * @Title: getGicDefaultVersion

+     * @Description:
+    
 * @author guojuxing 

+     * @return  java.util.Map<java.lang.String,java.lang.String>

+    
 */
+    @Override
+    public ServiceResponse<Map<String, String>> getGicDefaultVersion() {
+        Map<String, String> map = new HashMap<>(16);
+        ServiceResponse<List<ServePropDTO>> versionListResult = serveApiService.listServePropByGICDefaultAPP();
+        if (versionListResult.isSuccess()) {
+            List<ServePropDTO> versionList = versionListResult.getResult();
+            if (CollectionUtils.isNotEmpty(versionList)) {
+                for (ServePropDTO servePropDTO : versionList) {
+                    if ("version".equals(servePropDTO.getPropType())) {
+                        map.put(servePropDTO.getCode(), servePropDTO.getName());
+                    }
+                }
+            }
+        }
+        return ServiceResponse.success(map);
+    }
+
     private ServiceResponse<Void> savePage(MenuDTO menuDTO, Class clazz) {
         ServiceResponse paramsValid = ValidParamsUtils.allCheckValidate(menuDTO, clazz);
         if (!paramsValid.isSuccess()) {
@@ -556,7 +583,12 @@ public class MenuApiServiceImpl implements MenuApiService {
      */
     private void setNormalFieldValue(MenuDTO menuDTO) {
         //sort
-        int maxSort = menuService.getMaxSortByParentId(MenuLevelConstants.FIRST_LEVEL_PARENT_ID, menuDTO.getProject());
+        int maxSort;
+        if (MenuProjectConstants.DEFAULT_PROJECT.equals(menuDTO.getProject())) {
+            maxSort = menuService.getMaxSortByParentId(MenuLevelConstants.FIRST_LEVEL_PARENT_ID, menuDTO.getProject());
+        } else {
+            maxSort = menuService.getMaxSortByParentId(MenuLevelConstants.FIRST_LEVEL_PARENT_ID, null);
+        }
         menuDTO.setSort(maxSort + 1);
         //level
         menuDTO.setLevel(1);
@@ -627,18 +659,21 @@ public class MenuApiServiceImpl implements MenuApiService {
      * 设置版本ID和版本名称字段值
      * @param menuDTO 必须有project值
      */
-    private static void setMenuVersion(MenuDTO menuDTO) {
+    private void setMenuVersion(MenuDTO menuDTO) {
         if (MenuProjectConstants.DEFAULT_PROJECT.equals(menuDTO.getProject())) {
             menuDTO.setMenuVersion(SignConstants.UNDERLINE
                     + menuDTO.getMenuVersion().replaceAll(SignConstants.COMMA, SignConstants.UNDERLINE)
                     + SignConstants.UNDERLINE);
             String[] menuVersionArr = menuDTO.getMenuVersion().split(SignConstants.UNDERLINE);
             StringBuilder result = new StringBuilder();
+
+
+            Map<String, String> gicDefaultVersion = getGicDefaultVersion().getResult();
             for (String str : menuVersionArr) {
                 if (StringUtils.isBlank(str)) {
                     continue;
                 }
-                result.append(GicVersionEnum.getMessageByCode(Integer.parseInt(str))).append(SignConstants.SLASH);
+                result.append(gicDefaultVersion.get(str)).append(SignConstants.SLASH);
             }
             String menuVersionStr = result.toString();
             menuDTO.setMenuVersionName(menuVersionStr.substring(0, menuVersionStr.length() - 1));

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/UserApiServiceImpl.java

@@ -16,6 +16,7 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.enterprise.constants.Constants;
 import com.gic.enterprise.error.ErrorCode;
+import com.gic.enterprise.utils.AutoCreatePasswordUtils;
 import com.gic.enterprise.utils.UserDetail;
 import com.gic.enterprise.utils.UserDetailUtils;
 import com.gic.redis.data.util.RedisUtil;
@@ -113,6 +114,31 @@ public class UserApiServiceImpl implements UserApiService {
         }
     }
 
+    @Override
+    public ServiceResponse<Integer> saveAdmin(UserDTO userDTO) {
+        //valid param
+        ServiceResponse paramResult = ValidUtil.allCheckValidate(userDTO, UserDTO.SaveUserValid.class);
+        if (!paramResult.isSuccess()) {
+            return paramResult;
+        }
+        if (userService.isPhoneRepeat(null, userDTO.getPhoneNumber(), userDTO.getEnterpriseId())) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "手机号码不能重复");
+        }
+        if (userDTO.getPasswordType() == null) {
+            //默认自定义创建密码类型
+            userDTO.setPasswordType(2);
+        }
+
+        if (StringUtils.isBlank(userDTO.getPhoneAreaCode())) {
+            userDTO.setPhoneAreaCode("86");
+        }
+        userDTO.setCreateTime(new Date());
+        userDTO.setUpdateTime(new Date());
+        userDTO.setStatus(1);
+        Integer userId = userService.saveUser(userDTO);
+        return ServiceResponse.success(userId);
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public ServiceResponse editUser(UserDTO userDTO) {
@@ -169,6 +195,10 @@ public class UserApiServiceImpl implements UserApiService {
             if (StringUtils.isBlank(userDTO.getPassword())) {
                 return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "密码为空，操作有误");
             }
+            userDTO.setPassword(AutoCreatePasswordUtils.encryptPassword(userDTO.getPassword()));
+        } else if (userDTO.getPasswordType() != null && userDTO.getPasswordType().intValue() == 1) {
+            //如果是自动生成
+            userDTO.setPassword(AutoCreatePasswordUtils.autoCreatePassword(8));
         }
         userDTO.setUserId(adminUser.getUserId());
         userService.editUser(userDTO);

gic-platform-auth-service/src/main/resources/dubbo-gic-platform-auth-service.xml

@@ -32,6 +32,7 @@
     <dubbo:reference interface="com.gic.open.api.service.ApplicationApiService" id="applicationApiService" timeout="6000" />
     <!--应用市场应用列表-->
     <dubbo:reference interface="com.gic.open.api.service.AppTokenApiService" id="appTokenApiService" timeout="6000" />
+    <dubbo:reference interface="com.gic.open.api.service.ServeApiService" id="serveApiService" timeout="60000" />
     <!--审核员-->
     <dubbo:service interface="com.gic.auth.service.AuditorApiService" ref="auditorApiService" timeout="6000" />
     <dubbo:reference interface="com.gic.enterprise.service.ProjectItemApiService" id="projectItemApiService" timeout="6000" />

gic-platform-auth-service/src/main/resources/mapper/TabSysMenuMapper.xml

@@ -288,7 +288,9 @@
     from tab_sys_menu
     where status=1
     and parent_id = #{parentId}
-    and project = #{project}
+    <if test="project != null">
+      and project = #{project}
+    </if>
   </select>
 
 

gic-platform-auth-service/src/main/resources/mapper/TabSysResourceMapper.xml

@@ -194,6 +194,9 @@
     <if test="resourceName != null and resourceName != '' ">
         and resource_name like concat('%', #{resourceName}, '%')
     </if>
+    <if test="enterpriseId != null ">
+        and enterprise_id = #{enterpriseId}
+    </if>
   </select>
   <select id="getBySelective" resultMap="BaseResultMap">
     select

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/LoginController.java

 package com.gic.auth.web.controller;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.gic.enterprise.base.UserInfo;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.LogManager;
-import org.apache.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.auth.dto.MenuDTO;
 import com.gic.auth.dto.UserDTO;
@@ -23,12 +9,25 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.Md5Util;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.base.EnterpriseInfo;
+import com.gic.enterprise.base.UserInfo;
 import com.gic.enterprise.dto.EnterpriseDTO;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.response.EnterpriseRestResponse;
 import com.gic.enterprise.service.EnterpriseApiService;
 import com.gic.enterprise.utils.UserDetail;
 import com.gic.enterprise.utils.UserDetailUtils;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @RestController
 public class LoginController {
@@ -93,7 +92,6 @@ public class LoginController {
             if(enterprise.isSuccess()){
                 EnterpriseDTO enterpriseDTO = enterprise.getResult();
                 if(enterpriseDTO != null){
-                    userDetail.setEnterpriseId(enterpriseDTO.getEnterpriseId());
                     userDetail.setEnterpriseInfo(EntityUtil.changeEntityNew(EnterpriseInfo.class, enterpriseDTO));
 
                     ServiceResponse<List<MenuDTO>> menuResult = menuApiService.listUserMenu(userDetail.getUserId());