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/pom.xml

@@ -24,6 +24,7 @@
         <gic-redis-data>4.0-SNAPSHOT</gic-redis-data>
         <gic-bizdict-api>4.0.0-SNAPSHOT</gic-bizdict-api>
         <gic-platform-auth-api>4.0-SNAPSHOT</gic-platform-auth-api>
+        <gic-wechat-business-api>4.0-SNAPSHOT</gic-wechat-business-api>
     </properties>
 
     <dependencies>
@@ -123,6 +124,11 @@
             <artifactId>gic-open-platform-api</artifactId>
             <version>4.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-wechat-business-api</artifactId>
+            <version>${gic-wechat-business-api}</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -15,6 +15,7 @@ import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.qo.ProjectItemQO;
 import com.gic.enterprise.response.EnterpriseServiceResponse;
 import com.gic.enterprise.service.ProjectItemApiService;
+import com.gic.wechat.business.api.service.fwh.WeixinBaseFunService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -48,6 +49,8 @@ public class AuditorApiServiceImpl implements AuditorApiService {
     private ProjectItemApiService projectItemApiService;
     @Autowired
     private AuditedGroupService auditedGroupService;
+    @Autowired
+    private WeixinBaseFunService weixinBaseFunService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -189,6 +192,15 @@ public class AuditorApiServiceImpl implements AuditorApiService {
 //        EnterpriseDTO enterpriseDTO = this.enterpriseService.getEnterpriseById(enterpriseId);
 //        String qrCodeUrl = this.weixinBaseFunService.getTemporaryQRcodeURL(enterpriseDTO.getAppkey(), "auditor_"+auditorId, 300);
 //        return qrCodeUrl;
-        return "qrCodeUrl";
+        logger.info("生成临时带参二维码 auditorId:{}", auditorId);
+        ServiceResponse<String> serviceResponse = weixinBaseFunService.getTemporaryQRcodeURL("appkey", "auditor_" + auditorId, 300);
+        if (serviceResponse.isSuccess()) {
+            logger.info("临时带参二维码生成成功:{}", serviceResponse.getResult());
+            return serviceResponse.getResult();
+        } else {
+            logger.info("临时带参二维码生成失败:{}", serviceResponse.getMessage());
+            return null;
+        }
+//        return "qrCodeUrl";
     }
 }

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

@@ -33,4 +33,6 @@
     <!--审核员-->
     <dubbo:service interface="com.gic.auth.service.AuditorApiService" ref="auditorApiService" timeout="6000" />
     <dubbo:reference interface="com.gic.enterprise.service.ProjectItemApiService" id="projectItemApiService" timeout="6000" />
+    <!--微信回调-->
+    <dubbo:reference interface="com.gic.wechat.business.api.service.fwh.WeixinBaseFunService" id="weixinBaseFunService" timeout="6000" />
 </beans>