Merge branch 'developer' of…

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

gic-platform-auth-service/src/main/java/com/gic/auth/config/Config.java

+package com.gic.auth.config;
+
+import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@EnableApolloConfig
+public class Config {
+    @Value("${appkey}")
+    private String appkey;
+
+    public String getAppkey() {
+        return appkey;
+    }
+
+    public void setAppkey(String appkey) {
+        this.appkey = appkey;
+    }
+}

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

@@ -2,6 +2,7 @@ package com.gic.auth.service.outer.impl;
 
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.auth.config.Config;
 import com.gic.auth.dto.AuditorDTO;
 import com.gic.auth.entity.TabAuditor;
 import com.gic.auth.entity.TabAuditorAuditedGroupRel;
@@ -62,8 +63,8 @@ public class AuditorApiServiceImpl implements AuditorApiService {
     private ServiceUserApiService serviceUserApiService;
     @Autowired
     private UserService userService;
-    // 服务号APPKEY
-    public static final String APPKEY = "wxc6fd9beaf9a9dbe9";
+    @Autowired
+    private Config config;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -286,7 +287,7 @@ public class AuditorApiServiceImpl implements AuditorApiService {
 
     private String getTempQrCodeUrl(Integer auditorId) {
         logger.info("生成临时带参二维码 auditorId:{}", auditorId);
-        ServiceResponse<String> serviceResponse = weixinBaseFunService.getTemporaryQRcodeURL(APPKEY, "auditor_" + auditorId, 300);
+        ServiceResponse<String> serviceResponse = weixinBaseFunService.getTemporaryQRcodeURL(config.getAppkey(), "auditor_" + auditorId, 300);
         if (serviceResponse.isSuccess()) {
             logger.info("临时带参二维码生成成功:{}", serviceResponse.getResult());
             return serviceResponse.getResult();

gic-platform-auth-web/pom.xml

@@ -114,12 +114,12 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>3.11</version>
+            <version>3.17</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>3.11</version>
+            <version>3.17</version>
         </dependency>
         <dependency>
             <groupId>com.gic </groupId>

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

 package com.gic.auth.web.controller;
 
 import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.servlet.http.HttpServletRequest;
 
 import com.alibaba.fastjson.JSON;
+import com.gic.download.qo.HeaderQO;
 import com.gic.enterprise.context.RequestContext;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -89,10 +92,11 @@ public class CollaboratorController extends DownloadUtils{
                         return result.getResult().getResult();
                     }
                 };
-                String[] headers = new String[] {"协作人名称",  "手机号",  "创建时间"};
+                List<HeaderQO> headerList = Stream.of(new HeaderQO("测试1", Arrays.asList("名称","时间","时间")),
+                        new HeaderQO("测试2", null)).collect(Collectors.toList());
                 String[] fields = new String[] { "collaboratorName", "phone" , "createTime"};
                 try {
-                    download(path, reportId, fileName, excelExtensionCode, Arrays.asList(headers), Arrays.asList(fields), loader, Arrays.asList("phone"), null);
+                    downloadOfDoubleHeaderTitle(path, reportId, fileName, excelExtensionCode, headerList, Arrays.asList(fields), loader, Arrays.asList("phone"), null);
                 } catch (Exception e) {
                     LOGGER.warn(e);
                 }

gic-platform-auth-web/src/main/java/com/gic/auth/web/utils/ExcelUtils.java

@@ -169,7 +169,7 @@ public class ExcelUtils {
     private static XSSFCellStyle getTitleStyle(XSSFWorkbook workbook) {
         XSSFCellStyle style = ExcelUtils.getColumnTopStyle(workbook);
         style.setFillForegroundColor(IndexedColors.LIGHT_GREEN.getIndex());
-        style.setFillPattern(CellStyle.SOLID_FOREGROUND);
+//        style.setFillPattern(CellStyle.SOLID_FOREGROUND);
         return style;
     }
 
@@ -183,25 +183,25 @@ public class ExcelUtils {
         // 设置字体大小
         font.setFontHeightInPoints((short) 11);
         // 字体加粗
-        font.setBoldweight(XSSFFont.BOLDWEIGHT_BOLD);
+//        font.setBoldweight(XSSFFont.BOLDWEIGHT_BOLD);
         // 设置字体名字
         font.setFontName("Courier New");
         // 设置样式;
         XSSFCellStyle style = workbook.createCellStyle();
         // 设置底边框;
-        style.setBorderBottom(XSSFCellStyle.BORDER_THIN);
+//        style.setBorderBottom(XSSFCellStyle.BORDER_THIN);
         // 设置底边框颜色;
 //        style.setBottomBorderColor(XSSFColor.BLACK.index);
         // 设置左边框;
-        style.setBorderLeft(XSSFCellStyle.BORDER_THIN);
+//        style.setBorderLeft(XSSFCellStyle.BORDER_THIN);
         // 设置左边框颜色;
 //        style.setLeftBorderColor(XSSFColor.BLACK.index);
         // 设置右边框;
-        style.setBorderRight(XSSFCellStyle.BORDER_THIN);
+//        style.setBorderRight(XSSFCellStyle.BORDER_THIN);
         // 设置右边框颜色;
 //        style.setRightBorderColor(XSSFColor.BLACK.index);
         // 设置顶边框;
-        style.setBorderTop(XSSFCellStyle.BORDER_THIN);
+//        style.setBorderTop(XSSFCellStyle.BORDER_THIN);
         // 设置顶边框颜色;
 //        style.setTopBorderColor(XSSFColor.BLACK.index);
         // 在样式用应用设置的字体;
@@ -209,9 +209,9 @@ public class ExcelUtils {
         // 设置自动换行;
         style.setWrapText(false);
         // 设置水平对齐的样式为居中对齐;
-        style.setAlignment(XSSFCellStyle.ALIGN_CENTER);
+//        style.setAlignment(XSSFCellStyle.ALIGN_CENTER);
         // 设置垂直对齐的样式为居中对齐;
-        style.setVerticalAlignment(XSSFCellStyle.VERTICAL_CENTER);
+//        style.setVerticalAlignment(XSSFCellStyle.VERTICAL_CENTER);
 
         return style;
 
@@ -234,19 +234,19 @@ public class ExcelUtils {
         // 设置样式;
         XSSFCellStyle style = workbook.createCellStyle();
         // 设置底边框;
-        style.setBorderBottom(XSSFCellStyle.BORDER_THIN);
+//        style.setBorderBottom(XSSFCellStyle.BORDER_THIN);
         // 设置底边框颜色;
 //        style.setBottomBorderColor(XSSFColor.BLACK.index);
         // 设置左边框;
-        style.setBorderLeft(XSSFCellStyle.BORDER_THIN);
+//        style.setBorderLeft(XSSFCellStyle.BORDER_THIN);
         // 设置左边框颜色;
 //        style.setLeftBorderColor(XSSFColor.BLACK.index);
         // 设置右边框;
-        style.setBorderRight(XSSFCellStyle.BORDER_THIN);
+//        style.setBorderRight(XSSFCellStyle.BORDER_THIN);
         // 设置右边框颜色;
 //        style.setRightBorderColor(XSSFColor.BLACK.index);
         // 设置顶边框;
-        style.setBorderTop(XSSFCellStyle.BORDER_THIN);
+//        style.setBorderTop(XSSFCellStyle.BORDER_THIN);
         // 设置顶边框颜色;
 //        style.setTopBorderColor(XSSFColor.BLACK.index);
         // 在样式用应用设置的字体;
@@ -254,9 +254,9 @@ public class ExcelUtils {
         // 设置自动换行;
         style.setWrapText(false);
         // 设置水平对齐的样式为居中对齐;
-        style.setAlignment(XSSFCellStyle.ALIGN_CENTER);
+//        style.setAlignment(XSSFCellStyle.ALIGN_CENTER);
         // 设置垂直对齐的样式为居中对齐;
-        style.setVerticalAlignment(XSSFCellStyle.VERTICAL_CENTER);
+//        style.setVerticalAlignment(XSSFCellStyle.VERTICAL_CENTER);
 
         return style;
     }