Merge remote-tracking branch 'origin/master'

system/system-application/pom.xml

@@ -75,11 +75,6 @@
             <artifactId>micrometer-registry-prometheus</artifactId>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>io.prometheus</groupId>-->
-<!--            <artifactId>simpleclient_spring_boot</artifactId>-->
-<!--        </dependency>-->
-
         <!-- 测试相关 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

system/system-application/src/main/java/cn/iocoder/mall/admin/application/config/MonitorConfiguration.java

@@ -1,9 +0,0 @@
-package cn.iocoder.mall.admin.application.config;
-
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-//@EnablePrometheusEndpoint
-//@EnableSpringBootMetricsCollector
-public class MonitorConfiguration {
-}

system/system-application/src/main/java/cn/iocoder/mall/admin/application/controller/admins/PassportController.java

@@ -5,6 +5,8 @@ import cn.iocoder.mall.admin.api.AdminService;
 import cn.iocoder.mall.admin.api.OAuth2Service;
 import cn.iocoder.mall.admin.api.bo.admin.AdminAuthenticationBO;
 import cn.iocoder.mall.admin.api.dto.admin.AdminAuthenticationDTO;
+import io.micrometer.core.instrument.Counter;
+import io.micrometer.core.instrument.Metrics;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.dubbo.config.annotation.Reference;
@@ -19,6 +21,11 @@ import static cn.iocoder.common.framework.vo.CommonResult.success;
 @Api("Admin Passport 模块")
 public class PassportController {
 
+    /**
+     * 登陆总数 Metrics
+     */
+    private static final Counter METRICS_LOGIN_TOTAL = Metrics.counter("mall.admin.passport.login.total");
+
     @Reference(validation = "true", version = "${dubbo.provider.OAuth2Service.version}")
     private OAuth2Service oauth2Service;
 
@@ -28,6 +35,9 @@ public class PassportController {
     @PostMapping("/login")
     @ApiOperation(value = "手机号 + 密码登陆")
     public CommonResult<AdminAuthenticationBO> login(AdminAuthenticationDTO adminAuthenticationDTO) {
+        // 增加计数
+        METRICS_LOGIN_TOTAL.increment();
+        // 执行登陆
         return success(adminService.authentication(adminAuthenticationDTO));
     }
 

system/system-application/src/main/resources/application-test.yaml

@@ -6,13 +6,13 @@ spring:
         url: http://127.0.0.1:18097
 
 
-management:
-  endpoints:
-    web:
-      exposure:
-        include: "*"
-  server:
-    port: 19083 # 配置独立端口。而该端口，不使用 nginx 对外暴露，从而不配置安全认证。也就是说，内网环境可访问，外网环境不可访问。当然，这么做的前提是，认为内网安全。
+#management:
+#  endpoints:
+#    web:
+#      exposure:
+#        include: "*"
+#  server:
+#    port: 19083 # 配置独立端口。而该端口，不使用 nginx 对外暴露，从而不配置安全认证。也就是说，内网环境可访问，外网环境不可访问。当然，这么做的前提是，认为内网安全。
 
 swagger:
   enable: true # 暂时不去掉

system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/sms/PageSmsSignBO.java

@@ -1,6 +1,5 @@
 package cn.iocoder.mall.admin.api.bo.sms;
 
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -28,7 +27,7 @@ public class PageSmsSignBO {
 
     @Data
     @Accessors(chain = true)
-    public class Sign {
+    public static class Sign {
         /**
          * 编号
          */

system/system-service-api/src/main/java/cn/iocoder/mall/admin/api/bo/sms/PageSmsTemplateBO.java

@@ -25,7 +25,7 @@ public class PageSmsTemplateBO {
 
     @Data
     @Accessors(chain = true)
-    public class Template {
+    public static class Template {
         /**
          * 编号
          */