merge wcp to ljx_test

Dockerfile

@@ -10,13 +10,13 @@ WORKDIR /var/lib/ds
 
 
 RUN yum install -y wget \
-    && wget https://mirrors-i.tuna.tsinghua.edu.cn/Adoptium/17/jdk/x64/linux/OpenJDK17U-jdk_x64_linux_hotspot_17.0.11_9.tar.gz \
-    && tar -zxvf OpenJDK17U-jdk_x64_linux_hotspot_17.0.11_9.tar.gz \
+    && wget https://mirrors-i.tuna.tsinghua.edu.cn/Adoptium/17/jdk/x64/linux/OpenJDK17U-jdk_x64_linux_hotspot_17.0.12_7.tar.gz \
+    && tar -zxvf OpenJDK17U-jdk_x64_linux_hotspot_17.0.12_7.tar.gz \
     && wget https://mirrors.tuna.tsinghua.edu.cn/apache/maven/maven-3/3.8.8/binaries/apache-maven-3.8.8-bin.tar.gz \
     && tar -xzvf apache-maven-3.8.8-bin.tar.gz \
     && yum install -y git
 
-ENV JAVA_HOME=/var/lib/ds/jdk-17.0.11+9
+ENV JAVA_HOME=/var/lib/ds/jdk-17.0.12+7
 ENV PATH=${JAVA_HOME}/bin:$PATH
 
 ENV MAVEN_HOEM=/var/lib/ds/apache-maven-3.8.8
@@ -26,6 +26,9 @@ ENV LC_ALL C.UTF-8
 
 WORKDIR /var/lib/ds/datastat-server
 COPY . /var/lib/ds/datastat-server
+
+ENV CONFIG_PATH=/opt/config
+
 RUN mvn clean install package -Dmaven.test.skip && \
         mv ./target/ds-0.0.1-SNAPSHOT.jar ../ds.jar
 
@@ -35,4 +38,4 @@ RUN useradd -u 1000 datastat -s /bin/bash -m -U && \
     chown -R datastat:datastat om-data
 
 USER datastat
-CMD java -jar ds.jar
+CMD java -jar ds.jar --spring.config.location=${CONFIG_PATH}/application.properties

src/main/java/com/datastat/config/FoundryConfig.java

@@ -18,7 +18,7 @@
 import org.springframework.context.annotation.PropertySource;
 
 @ConfigurationProperties(prefix = "foundry")
-@PropertySource(value = {"file:${user.dir}/foundry.properties"}, encoding = "UTF-8")
+@PropertySource(value = {"file:${config.path}/foundry.properties"}, encoding = "UTF-8")
 @Configuration("foundryConf")
 @Data
 public class FoundryConfig extends CustomPropertiesConfig {

src/main/java/com/datastat/config/MindSporeConfig.java

@@ -18,7 +18,7 @@
 import org.springframework.context.annotation.PropertySource;
 
 @ConfigurationProperties(prefix = "mindspore")
-@PropertySource(value = {"file:${user.dir}/mindSpore.properties"}, encoding = "UTF-8")
+@PropertySource(value = {"file:${config.path}/mindspore.properties"}, encoding = "UTF-8")
 @Configuration("mindsporeConf")
 @Data
 public class MindSporeConfig extends CustomPropertiesConfig {

src/main/java/com/datastat/config/OpenEulerConfig.java

@@ -18,7 +18,7 @@
 import org.springframework.context.annotation.PropertySource;
 
 @ConfigurationProperties(prefix = "openeuler")
-@PropertySource(value = {"file:${user.dir}/openEuler.properties"}, encoding = "UTF-8")
+@PropertySource(value = {"file:${config.path}/openeuler.properties"}, encoding = "UTF-8")
 @Configuration("openeulerConf")
 @Data
 public class OpenEulerConfig extends CustomPropertiesConfig {

src/main/java/com/datastat/config/OpenGaussConfig.java

@@ -26,7 +26,7 @@
 import org.springframework.core.env.Environment;
 
 @ConfigurationProperties(prefix = "opengauss")
-@PropertySource(value = {"file:${user.dir}/openGauss.properties"}, encoding = "UTF-8")
+@PropertySource(value = {"file:${config.path}/opengauss.properties"}, encoding = "UTF-8")
 @Configuration("opengaussConf")
 @Data
 public class OpenGaussConfig extends CustomPropertiesConfig {

src/main/java/com/datastat/config/OpenLookengConfig.java

@@ -18,7 +18,7 @@
 import org.springframework.context.annotation.PropertySource;
 
 @ConfigurationProperties(prefix = "openlookeng")
-@PropertySource(value = {"file:${user.dir}/openLookeng.properties"}, encoding = "UTF-8")
+@PropertySource(value = {"file:${config.path}/openlookeng.properties"}, encoding = "UTF-8")
 @Configuration("openlookengConf")
 @Data
 public class OpenLookengConfig extends CustomPropertiesConfig {

src/main/java/com/datastat/config/QueryConfig.java

@@ -18,7 +18,7 @@
 import org.springframework.context.annotation.PropertySource;
 
 @ConfigurationProperties(prefix = "custom")
-@PropertySource(value = {"file:${user.dir}/custom.properties"})
+@PropertySource(value = {"file:${config.path}/custom.properties"})
 @Configuration("queryConf")
 @Data
 public class QueryConfig extends CustomPropertiesConfig {

src/main/java/com/datastat/config/SoftwareConfig.java

@@ -9,7 +9,7 @@
 import lombok.Data;
 
 @ConfigurationProperties(prefix = "software")
-@PropertySource(value = {"file:${user.dir}/software.properties"}, encoding = "UTF-8")
+@PropertySource(value = {"file:${config.path}/software.properties"}, encoding = "UTF-8")
 @Configuration("softwareConf")
 @Data
 public class SoftwareConfig extends CustomPropertiesConfig {

src/main/java/com/datastat/constant/Constant.java

@@ -0,0 +1,15 @@
+package com.datastat.constant;
+
+public final class Constant {
+
+    private Constant() {
+        throw new AssertionError("Constant class cannot be instantiated.");
+    }
+
+    public static final String SRC_OPENEULER = "src-openeuler";
+
+    public static final String FEEDBACK_OWNER = "openeuler";
+
+    public static final String FEEDBACK_REPO = "easy-software";
+
+}

src/main/java/com/datastat/controller/QueryController.java

@@ -14,6 +14,7 @@
 import com.datastat.aop.LimitRequest;
 import com.datastat.aop.RateLimit;
 import com.datastat.interceptor.authentication.UserLoginToken;
+import com.datastat.interceptor.oneid.CompanyToken;
 import com.datastat.interceptor.oneid.OneidToken;
 import com.datastat.interceptor.oneid.SigToken;
 import com.datastat.model.DatastatRequestBody;
@@ -25,6 +26,8 @@
 import com.datastat.model.QaBotRequestBody;
 import com.datastat.model.SigGathering;
 import com.datastat.model.TeamupApplyForm;
+import com.datastat.model.dto.ContributeRequestParams;
+import com.datastat.model.dto.NpsIssueBody;
 import com.datastat.model.meetup.MeetupApplyForm;
 import com.datastat.model.vo.*;
 import com.datastat.service.QueryService;
@@ -284,6 +287,7 @@ public String queryCompanyName(HttpServletRequest request,
     }
 
     @OneidToken
+    @CompanyToken
     @RequestMapping("/company/usercontribute")
     public String queryCompanyUserContribute(HttpServletRequest request,
                                              @RequestParam(value = "community") String community,
@@ -295,6 +299,7 @@ public String queryCompanyUserContribute(HttpServletRequest request,
     }
 
     @OneidToken
+    @CompanyToken
     @RequestMapping("/company/sigcontribute")
     public String queryCompanySigcontribute(HttpServletRequest request,
                                             @RequestParam(value = "community") String community,
@@ -306,6 +311,7 @@ public String queryCompanySigcontribute(HttpServletRequest request,
     }
 
     @OneidToken
+    @CompanyToken
     @RequestMapping("/company/sigdetails")
     public String queryCompanySigDetails(HttpServletRequest request,
                                          @RequestParam(value = "community") String community,
@@ -325,6 +331,7 @@ public String querySigUserTypeCount(HttpServletRequest request,
     }
 
     @OneidToken
+    @CompanyToken
     @RequestMapping("/company/users")
     public String queryCompanyUsers(HttpServletRequest request,
                                     @RequestParam(value = "community") String community,
@@ -630,6 +637,13 @@ public String queryRepoSigInfo(HttpServletRequest request,
         return queryService.queryRepoSigInfo(request, community, repo);
     }
 
+    @RequestMapping(value = "/repo/sig/list")
+    public String queryRepoSigInfoList(HttpServletRequest request,
+            @RequestParam(value = "community") String community,
+            @RequestParam(value = "repo", required = false) String repo) {
+        return queryService.queryRepoSigInfoList(request, community, repo);
+    }
+
     @RequestMapping(value = "/software/info")
     public String querySoftwareInfo(HttpServletRequest request,
             @RequestParam(value = "community") String community,
@@ -646,8 +660,9 @@ public String querySoftwareAppDownload(HttpServletRequest request,
     }
 
     @RequestMapping(value = "/agc/analytics/callback", method = RequestMethod.POST)
-    public String callback(HttpServletRequest request, @RequestBody @Valid HmsExportDataReq req) {
-        return queryService.callback(request, req);
+    public String callback(HttpServletRequest request, @RequestParam(value = "path", required = false) String path,
+            @RequestBody @Valid HmsExportDataReq req) {
+        return queryService.callback(request, path, req);
     }
 
     @RequestMapping(value = "/isv/count", method = RequestMethod.POST)
@@ -773,4 +788,19 @@ public String addSigGathering(HttpServletRequest request,
         String res = queryService.putSigGathering(request, community, sigGatherings, token);
         return res;
     }
+
+    @RequestMapping("/repo/issues")
+    public String queryRepoIssues(HttpServletRequest request, ContributeRequestParams params) throws Exception {
+        return queryService.queryRepoIssues(request, params);
+    }
+
+    @LimitRequest(callTime = 1, callCount = 1000)
+    @RateLimit
+    @RequestMapping(value = "/nps/issue", method = RequestMethod.POST)
+    public String putNpsIssue(HttpServletRequest request,
+            @CookieValue(value = "_Y_G_", required = false) String token,
+            @RequestParam(value = "community") String community,
+            @Valid @RequestBody NpsIssueBody body) {
+        return queryService.putNpsIssue(request, community, body, token);
+    }
 }