Quellcode durchsuchen

分环境配置

Hai Lin vor 2 Monaten
Ursprung
Commit
8741447e2f

+ 4 - 4
mirage-service/src/main/java/com/mirage/mirageservice/controller/WxController.java

@@ -75,7 +75,7 @@ public class WxController {
         return userService.getUserWxInfo(code, configEnum);
     }
 
-    @Auth(value = AuthType.OPEN)
+    @Auth(value = AuthType.COOKIES)
     @RequestMapping(value = "/user/bind", method = RequestMethod.POST)
     public Object bind(@RequestBody BindRequest bindRequest){
         if(null == bindRequest
@@ -87,7 +87,7 @@ public class WxController {
         return userService.bind(bindRequest);
     }
 
-    @Auth(value = AuthType.OPEN)
+    @Auth(value = AuthType.COOKIES)
     @RequestMapping(value = "/user/unbind", method = RequestMethod.POST)
     public Object unbind(@RequestBody BindRequest bindRequest){
         if(null == bindRequest
@@ -97,7 +97,7 @@ public class WxController {
         return userService.unBind(bindRequest);
     }
 
-    @Auth(value = AuthType.OPEN)
+    @Auth(value = AuthType.COOKIES)
     @RequestMapping(value = "/user/reports", method = RequestMethod.GET)
     public Object reportList(@RequestParam String openId,
                              @RequestParam(required = false, defaultValue = "1") Integer pageIndex,
@@ -105,7 +105,7 @@ public class WxController {
         return userService.reportList(openId, pageIndex, pageSize);
     }
 
-    @Auth(value = AuthType.OPEN)
+    @Auth(value = AuthType.COOKIES)
     @RequestMapping(value = "/user/report/{id}", method = RequestMethod.GET)
     public Object getReportDetail(@PathVariable Integer id){
         return userService.getReportDetail(id);

BIN
mirage-service/src/main/resources/apiclient_cert.p12


+ 0 - 25
mirage-service/src/main/resources/apiclient_cert.pem

@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEKDCCAxCgAwIBAgIUftn98CEPSDBSnm7qN7leL7hdGoYwDQYJKoZIhvcNAQEL
-BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
-FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
-Q0EwHhcNMjUwMzA3MDI1NTMyWhcNMzAwMzA2MDI1NTMyWjCBgTETMBEGA1UEAwwK
-MTcwNzc3MzIwMDEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMS0wKwYDVQQL
-DCTml6DplKHlpYfplKbnvZHnu5znp5HmioDmnInpmZDlhazlj7gxCzAJBgNVBAYT
-AkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAL1rsrdP9PT86/RpU8844P4h0AEj2uDFlyppe3tL0ii5hA/oVgK2TJ2E
-lGI+GwiLkheBL+XCdzF8uhM6zCFqCa+kFEWX92vMRVN5NwNVEy1NV0ZeqOoLv/tC
-8KTQuL+poVf18mgDRQjNmF5oZMAe8vByVjiIh3ED6mBxfF1fQVqegPfZEe5OIVJt
-ceWb3smWl49ty4PHktsgtZ/ZRLt6LzAoLx0dJk/CgcGUiNWAo3HIhkSxund0mhJ2
-zGIrZjyeaYkZdf6RTw3rlINkwRIyDcLcq2kZ8KVdxT/D6QC6yNOf8ndRpnKvPEid
-UN1m7UcnZVNW4LR+Bddpe+wSGB+Lma0CAwEAAaOBuTCBtjAJBgNVHRMEAjAAMAsG
-A1UdDwQEAwID+DCBmwYDVR0fBIGTMIGQMIGNoIGKoIGHhoGEaHR0cDovL2V2Y2Eu
-aXRydXMuY29tLmNuL3B1YmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRC
-MDZBRDM5NzU0OTg0NkMwMUMzRThFQkQyJnNnPUhBQ0M0NzFCNjU0MjJFMTJCMjdB
-OUQzM0E4N0FEMUNERjU5MjZFMTQwMzcxMA0GCSqGSIb3DQEBCwUAA4IBAQCOcxpY
-ECmVzsPU+Ksr3hiTF2XzMO9TnLgAIks+lNx6sfzSPQ0kapB1mBhnebBornO/1GWx
-Ibp8JrIRzfH6kqTRI6pQgP2TQ3ML7nXNH7C8Bwb56uB+TYIc3RYVYmkrQxcEOESB
-yJLjskNvPS4BGden1Mp99jDUvjqtVe0WKKSMcCXW3TC4y282w0RkyPP00ps4aPbA
-wRFe6PYNg95fNZGJtYVqwYt8BR4z/BdLrBEuDaObIsIf/WWjn0Ddw+QtlD2rxIxh
-d61Fkt1hyjbKIVjpvMKRfYhS62TJeuWcmQCIDi480whmAJAZs6lMpGYiDE0TGuPb
-gTuTCv8/B8tS6wV8
------END CERTIFICATE-----

+ 0 - 28
mirage-service/src/main/resources/apiclient_key.pem

@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC9a7K3T/T0/Ov0
-aVPPOOD+IdABI9rgxZcqaXt7S9IouYQP6FYCtkydhJRiPhsIi5IXgS/lwncxfLoT
-OswhagmvpBRFl/drzEVTeTcDVRMtTVdGXqjqC7/7QvCk0Li/qaFX9fJoA0UIzZhe
-aGTAHvLwclY4iIdxA+pgcXxdX0FanoD32RHuTiFSbXHlm97JlpePbcuDx5LbILWf
-2US7ei8wKC8dHSZPwoHBlIjVgKNxyIZEsbp3dJoSdsxiK2Y8nmmJGXX+kU8N65SD
-ZMESMg3C3KtpGfClXcU/w+kAusjTn/J3UaZyrzxInVDdZu1HJ2VTVuC0fgXXaXvs
-Ehgfi5mtAgMBAAECggEADGS/jL7uiBkEVzmNAkH2dqo/sdNmvs4u1deQ/MA5P/Dj
-cycAeazz1lqWWtc1bZm0NVV+jMnsgpBmnFt8f7Mwbw2NRgBrb+ItpwiHUPCAELa+
-vxvycV3Tcd0vYZlGfUPcCqVM9wE/wxOwpHywGuHrg0/31DsaoYpgC29hc7qHzCX1
-0+xipCWxcTZrbQu9WppARpgzEcwOQdqJkOyaXsDjpc/N+ADxS4yZAg/Sr2npbTHS
-2tW/Gfpz+C8dFxt1r+DE+/sjvsIiDARTkkxwT1svv2hMoU2iPhpozCjmSzFwzoIB
-g6VfrkMvKcHoin6qQNvWsabyWEbPilVQ4XH+YXEtAQKBgQDzgxUEt9vyhVPvwOri
-4hiXPj0tlJeoI70ihoW1cOyfWKLp0OwSi8yOYVddcveBDRqfPPyqd/WZklRcv3M7
-AUHtHkM9QNPK6aGFfz1mbEPqCRyAEXI7yOdLU1sMj7w0r8jHmHyqbwTrszcqs0Ge
-znPPan2j/MqKdRVQQAypMRvhewKBgQDHInwElXiJIpm1hL28exkNo8nUvZFYsSHw
-Bs8Qhg9UN8rGve2oCNzXwSUBZo9LCyv9MyJR7MbEKfr0/t2dLo7SlNv4JnbIErb6
-j52laBwLNmeR7uxFWsCSXfrdJvr/IM6Rsnr+qbQFTbF5e91hmrnSPQyUpQFX+PbY
-KfBtxWNk9wKBgBAYng8NyDAjuASlD+GnaFC3AHw+0jd/BUV+9t+jc0ClLz+dW71u
-GDthG9FFhC63mwbjlR//hfB8x67JyOghkSYHVhJ6coV7I/4bBwf6KBMUPxoIDTD+
-eqtz+xS9e4dQB0mKPtNVO1IJKqBb8P56TxVqyJtKXmkAjEQdt7iHUnx5AoGBAIBX
-K1LQ+rR3hlVEzfwx4f22eBgSbSCaWOMXoFBn9m0y4A+izQ6lV5/+LVlvvh6BfsJb
-OF1QmvJGlCVeNXpeTVJO+k4+jAN6fE+US+gU5y4azDlzoPc5/C7ZPxtVSiMwA7JH
-M5n5ybo5To6bVBzZ2bUz/221wt3t6Tl8HibBNsQVAoGAHMbDIlsTdMHHaOZ2YTVB
-qMIFXTZ4hT5S36byEhAr8hXrRw6BUfctL+FTLALEV+/7tnbFWpMwr7LJmrxqryt4
-EfWmgyYhZtJKaIVxrFsXi58a3VY9YJPxzPhRZck+8jviswXeQr0ECEM/fsnlsCLI
-dK7CBQ6veRYwx8Ful5jh2XY=
------END PRIVATE KEY-----

+ 9 - 8
mirage-service/src/main/resources/application.yml → mirage-service/src/main/resources/application-dev.yml

@@ -1,4 +1,6 @@
 server:
+  profiles:
+    active: dev
   port: 8880
 spring:
   aop:
@@ -26,17 +28,16 @@ spring:
       username: 'root'
       password: 'mysql@2025'
       driver-class-name: com.mysql.cj.jdbc.Driver
-#      type: com.alibaba.druid.pool.DruidDataSource
       druid:
-#        exception-sorter-class-name: com.alibaba.druid.pool.vendor.MySqlExceptionSorter
-#        validation-query: SELECT 1
-#        test-while-idle: false
-#        test-on-borrow: false
-#        test-on-return: true
+        exception-sorter-class-name: com.alibaba.druid.pool.vendor.MySqlExceptionSorter
+        validation-query: SELECT 1
+        test-while-idle: false
+        test-on-borrow: false
+        test-on-return: true
         # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
-#        time-between-eviction-runs-millis: 30000
+        time-between-eviction-runs-millis: 30000
         # 配置一个连接在池中最小生存的时间,单位是毫秒
-#        min-evictable-idle-time-millis: 180000
+        min-evictable-idle-time-millis: 180000
         max-wait: 60000
         initial-size: 2
         max-active: 2

+ 66 - 0
mirage-service/src/main/resources/application-prod.yml

@@ -0,0 +1,66 @@
+server:
+  profiles:
+    active: prod
+  port: 8880
+spring:
+  aop:
+    auto: true
+    proxy-target-class: true
+  jackson:
+    time-zone: GMT+8
+    default-property-inclusion: 'non_null'
+  http:
+    converters:
+      preferred-json-mapper: gson
+  redis:
+    host:
+    port:
+    lettuce:
+      pool:
+        max-active: 20
+        max-idle: 20
+        min-idle: 0
+        max-wait: 3000
+    password:
+  datasource:
+    primary:
+      jdbc-url:
+      username:
+      password:
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      druid:
+        exception-sorter-class-name: com.alibaba.druid.pool.vendor.MySqlExceptionSorter
+        validation-query: SELECT 1
+        test-while-idle: false
+        test-on-borrow: false
+        test-on-return: true
+        # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+        time-between-eviction-runs-millis: 30000
+        # 配置一个连接在池中最小生存的时间,单位是毫秒
+        min-evictable-idle-time-millis: 180000
+        max-wait: 60000
+        initial-size: 2
+        max-active: 2
+        min-idle: 2
+    secondary:
+      jdbc-url:
+      username:
+      password:
+      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+      hikari:
+        connection-timeout: 30000
+        maximum-pool-size: 10
+  jpa:
+    primary:
+      properties:
+        hibernate:
+          dialect: org.hibernate.dialect.MySQL8Dialect
+          format_sql: true
+      show-sql: true
+    secondary:
+      properties:
+        hibernate:
+          dialect: org.hibernate.dialect.SQLServer2012Dialect
+          format_sql: true
+      show-sql: true
+

+ 66 - 0
mirage-service/src/main/resources/application-test.yml

@@ -0,0 +1,66 @@
+server:
+  profiles:
+    active: test
+  port: 8880
+spring:
+  aop:
+    auto: true
+    proxy-target-class: true
+  jackson:
+    time-zone: GMT+8
+    default-property-inclusion: 'non_null'
+  http:
+    converters:
+      preferred-json-mapper: gson
+  redis:
+    host: 8.155.61.172
+    port: 6379
+    lettuce:
+      pool:
+        max-active: 20
+        max-idle: 20
+        min-idle: 0
+        max-wait: 3000
+    password: 'redis@2025'
+  datasource:
+    primary:
+      jdbc-url: jdbc:mysql://8.155.61.172:3306/csqz-client?useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+      username: 'root'
+      password: 'mysql@2025'
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      druid:
+        exception-sorter-class-name: com.alibaba.druid.pool.vendor.MySqlExceptionSorter
+        validation-query: SELECT 1
+        test-while-idle: false
+        test-on-borrow: false
+        test-on-return: true
+        # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+        time-between-eviction-runs-millis: 30000
+        # 配置一个连接在池中最小生存的时间,单位是毫秒
+        min-evictable-idle-time-millis: 180000
+        max-wait: 60000
+        initial-size: 2
+        max-active: 2
+        min-idle: 2
+    secondary:
+      jdbc-url: jdbc:sqlserver://52.130.155.58:1433;databaseName=dcjxb_db_test;encrypt=false;trustServerCertificate=true
+      username: 'sa'
+      password: 'yzx@2023!!'
+      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+      hikari:
+        connection-timeout: 30000
+        maximum-pool-size: 10
+  jpa:
+    primary:
+      properties:
+        hibernate:
+          dialect: org.hibernate.dialect.MySQL8Dialect
+          format_sql: true
+      show-sql: true
+    secondary:
+      properties:
+        hibernate:
+          dialect: org.hibernate.dialect.SQLServer2012Dialect
+          format_sql: true
+      show-sql: true
+

+ 0 - 9
mirage-service/src/main/resources/pub_key.pem

@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3+4gjz9Kx6r4AHPEdthR
-x0knukJ/3W4b3rf0FFj0hv+IhtYBOWzx5yVttt41Z9qQHWlisms9CCRv1MVk9G/Q
-RZ2VvoVcuOF1cpyzwrpw5xGP/m4gGtKFP1gVouxfAizraxxyOdxFJvh/Er9OnLLt
-J383MPdVHR1YM+tpE+SnRPqEuIHohwP1eDRom46RkiX8+DT396zSFFCX6+irBnTA
-+yy5z4BmWNa1FMvp2NSqsBkczg6YZXWTJTDvLx5q0o4mF9+C7qxK/9pSK/iej0IE
-3eQaFiLlyl2fGj9ugk+/kRsuEnD2bpuSAaptm/NkJShmU+9xoCOJUZ6W+0H9CBUF
-0QIDAQAB
------END PUBLIC KEY-----

+ 0 - 6
mirage-service/src/main/resources/static/index.html

@@ -1,6 +0,0 @@
-<html>
-<body>
-<h1>hello word!!!</h1>
-<p>this is a html page</p>
-</body>
-</html>