Merge remote-tracking branch 'origin/developer' into developer

# Conflicts:
#	gic-platform-auth-web/pom.xml
#	gic-platform-auth-web/src/main/resources/dubbo-gic-platform-auth-web.xml

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

@@ -96,6 +96,19 @@ public interface AuditorApiService {
     ServiceResponse<List<AuditorDTO>> listAuditorByProject(Integer projectItemId, Integer userId, Integer enterpriseId);
 
     /**
+     * 查所有的审核员
+     * @Title: listAuditorByProject
+     * @Description:
+     * @author zhiwj
+     * @param projectItemCode
+     * @param userId
+     * @param enterpriseId
+     * @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.AuditorDTO>>
+     * @throws
+     */
+    ServiceResponse<List<AuditorDTO>> listAuditorByProject(String projectItemCode, Integer userId, Integer enterpriseId);
+
+    /**
      * 通过openid查询审核员
      * @Title: getAuditorByOpenid
      * @Description:

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

@@ -249,6 +249,16 @@ public class AuditorApiServiceImpl implements AuditorApiService {
     }
 
     @Override
+    public ServiceResponse<List<AuditorDTO>> listAuditorByProject(String projectItemCode, Integer userId, Integer enterpriseId) {
+        ServiceResponse<ProjectItemDTO> projectItemResponse = this.projectItemApiService.getByProjectItemCode(projectItemCode);
+        if (!projectItemResponse.isSuccess()) {
+            return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS);
+        }
+        ProjectItemDTO itemDTO = projectItemResponse.getResult();
+        return this.listAuditorByProject(itemDTO.getProjectItemId(), userId, enterpriseId);
+    }
+
+    @Override
     public ServiceResponse<AuditorDTO> getAuditorByOpenid(String openid) {
         TabAuditor auditor = this.auditorService.getAuditorByOpenid(openid);
         if (auditor != null) {

gic-platform-auth-web/pom.xml

@@ -22,6 +22,7 @@
         <!-- api依赖，正式版会在 gic-pom-base 里生成 -->
         <gic-store-api>4.0-SNAPSHOT</gic-store-api>
         <gic-redis-data>4.0-SNAPSHOT</gic-redis-data>
+        <gic-marketing-api>4.0-SNAPSHOT</gic-marketing-api>
     </properties>
 
     <dependencies>
@@ -139,6 +140,11 @@
         </dependency>
         <dependency>
             <groupId>com.gic</groupId>
+            <artifactId>gic-marketing-api</artifactId>
+            <version>${gic-marketing-api}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
             <artifactId>gic-enterprise-download</artifactId>
             <version>4.0-SNAPSHOT</version>
         </dependency>

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

@@ -20,6 +20,8 @@ import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
 import com.gic.goods.api.dto.GoodsRightsSelectorDTO;
 import com.gic.goods.api.service.GoodsRightsSelectorApiService;
+import com.gic.marketing.api.dto.sms.EnterpriseSmsSignDTO;
+import com.gic.marketing.api.service.sms.SmsApiService;
 import com.gic.store.dto.StoreWidgetDTO;
 import com.gic.store.service.StoreWidgetApiService;
 import org.apache.commons.collections.CollectionUtils;
@@ -47,6 +49,14 @@ public class ResourceController {
     private StoreWidgetApiService storeWidgetApiService;
     @Autowired
     private GoodsRightsSelectorApiService goodsRightsSelectorApiService;
+    @Autowired
+    private SmsApiService smsApiService;
+
+    @RequestMapping("/list-sms-sign")
+    public RestResponse listSmsSign(String search) {
+        ServiceResponse<List<EnterpriseSmsSignDTO>> serviceResponse = smsApiService.listSignByEnterprise(UserDetailUtils.getUserDetail().getEnterpriseId(), search);
+        return ResultControllerUtils.commonResult(serviceResponse);
+    }
 
     @RequestMapping("/save-resource")
     public RestResponse saveResource(@RequestBody ResourceQO resourceQO) {

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

@@ -59,6 +59,8 @@
     <dubbo:reference interface="com.gic.auth.service.AccountGroupApiService" id="accountGroupApiService" timeout="6000" />
     <!--协作人-->
     <dubbo:reference interface="com.gic.auth.service.CollaboratorApiService" id="collaboratorApiService" timeout="6000" />
+    <!--短信签名-->
+    <dubbo:reference interface="com.gic.marketing.api.service.sms.SmsApiService" id="smsApiService" timeout="6000" />
 
     <dubbo:reference interface="com.gic.enterprise.service.DownloadReportApiService" id="downloadReportApiService" timeout="6000"/>
 </beans>
\ No newline at end of file