Merge branch 'master' of http://git.ycjcjy.com/niucai/app-service

pom.xml

@@ -119,6 +119,14 @@
 			<version>3.0.0</version>
 		</dependency>
 		<!--swagger end-->
+
+		<dependency>
+			<groupId>Pingplusplus</groupId>
+			<artifactId>pingpp-java</artifactId>
+			<version>2.4.0</version>
+			<type>jar</type>
+		</dependency>
+
 	</dependencies>
 
 	<profiles>

src/main/java/com/yunzhi/niucai/interceptor/PermissionInterceptor.java

@@ -22,6 +22,9 @@ public class PermissionInterceptor implements HandlerInterceptor {
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object obj) throws Exception {
         log.info("Request URI: {}", request.getRequestURI());
 
+        if (request.getRequestURI().startsWith("/api/pingpp")){
+            return true;
+        }
         // JWT
         String jws = JWTUtils.getToken(request);
         if (StringUtils.isEmpty(jws)) {

src/main/resources/application-dev.yml

@@ -19,3 +19,17 @@ logging:
 #    sign: 牛彩
 #    # 有效时间 单位秒
 #    expire: 300
+
+pingpp:
+  appId: app_ynTWjD1OGSq9G4qz
+  apiKey: sk_test_1u9a18PeXfjP04GK8GbL4ybD
+  privateKey: -----BEGIN PUBLIC KEY-----
+               MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx1EJNIkSseFlkaZaE/vh
+               QS8AOQIbjpppyYNJv5nSAt/rRNJL+ZO3rd/ZdGx0uPUXJsQeUONkE8qqijhgDsgI
+               0ZRsRWo+fW1qTGjKJffTCiXIAIVGlQOOgK4hmiPzVqZnpqs51lhTbQicN8uiCVx2
+               0ujvYPPCzJqEOITS5RFYJpxFMlpumtWKr5MItu/aINVaLTd0pqKAdZaMaDjLki/d
+               5jrHR2HsZNJO1G91UqHS10J3/tG0rOZvxqbvDDslm1SYIo9AgDyw0AaqVqaPsLyW
+               0qoI4F8ayZVD3XEu+bWpBjhjaXEGbZu8FjvzhuZhlZvHDl8oT/V8ksXBY2Ibk+rm
+               swIDAQAB
+               -----END PUBLIC KEY-----
+  successUrl: https://127.0.0.1/api/pingpp/callback

src/main/resources/mapper/TaLotteryResultMapper.xml

@@ -6,11 +6,11 @@
         SELECT
             a.*
         FROM
-            ( SELECT * FROM ta_lottery_result t WHERE t.`status` = 1 ORDER BY t.issue_no DESC LIMIT 100 ) a
+            ( SELECT *
+                FROM
+                ( SELECT * FROM ta_lottery_result t WHERE t.`status` = 1 HAVING 1 ORDER BY t.issue_no DESC ) s
+                GROUP BY s.lottery_id
+            ) a
         INNER JOIN td_lottery b USING ( lottery_id )
-        GROUP BY
-            a.lottery_id
-        ORDER BY
-            b.sort_no
     </select>
 </mapper>