优化更新

.gitignore

-*/target/*
+# ignore idea files
 /.idea/*
 *.iml
 
@@ -15,13 +15,13 @@
 .factorypath
 .springBeans
 
+
 # ignore Maven generated target folders
 target
-logs
+*/target/*
+target/*
 
-/micro-project/micro-as/*[!xml]
-/micro-project/micro-context/*[!xml]
-/micro-project/micro-domain/*[!xml]
-/micro-project/micro-infrastructure/*[!xml]
-/micro-project/micro-scheduler/*[!xml]
-/micro-project/micro-transaction/*[!xml]
\ No newline at end of file
+# ignore log files
+*/logs/*
+*.log
+logs

src/main/java/com/ost/micro/filter/UrlFilter.java

@@ -32,11 +32,10 @@ public class UrlFilter extends ZuulFilter {
         HttpServletRequest request = ctx.getRequest();
         //String url = request.getScheme()+"://"+request.getServerName()+request.getRequestURI();
         String url = request.getRequestURL().toString();
-        log.info("request url is {}",url);
         if (url.contains("login") || url.contains("logout") || url.contains("captcha") || url.contains("webjars") || url.contains("druid")
                 || url.contains("swagger") || url.contains("/v2/api-docs") || url.contains("swagger-ui.html") || url.contains("/swagger-resources")
                 || url.contains("service") || url.contains("editor-app") || url.contains("/diagram-viewer") || url.contains("modeler.html")
-                || url.contains("favicon.ico") || url.contains("sys")) {
+                || url.contains("favicon.ico") || url.contains("sys") || url.contains("actuator")) {
             return false;
         }
         return true;

src/main/java/com/ost/micro/modules/security/config/ShiroConfig.java

@@ -64,6 +64,7 @@ public class ShiroConfig {
         filterMap.put("/modeler.html", "anon");
         filterMap.put("/captcha", "anon");
         filterMap.put("/favicon.ico", "anon");
+        filterMap.put("/actuator/health", "anon");
         filterMap.put("/**", "oauth2");
         shiroFilter.setFilterChainDefinitionMap(filterMap);
 

src/main/java/com/ost/micro/modules/security/controller/AuthController.java

+package com.ost.micro.modules.security.controller;
+
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 登录二次验证
+ *
+ * @author Mark sunlightcs@gmail.com
+ */
+@RestController
+@Api(tags="登录二次验证")
+@Slf4j
+public class AuthController {
+
+
+}

src/main/java/com/ost/micro/modules/security/controller/LoginController.java

@@ -108,7 +108,7 @@ public class LoginController {
 		sysLog.setCreateDate(new Date());
 		sysLog.setIp(IpUtils.getIpAddr(request));
 		sysLog.setUserAgent(request.getHeader(HttpHeaders.USER_AGENT));
-		sysLog.setIp(IpUtils.getIpAddr(request));
+		//sysLog.setIp(IpUtils.getIpAddr(request));
 		// 判断是商户登录还是商家登录,通过url去判断
 		if (url.contains("backmch")) {//商户后台登录
 			if ("admin".equals(login.getUsername())) {

src/main/resources/application-dev.yml

-server:
-  tomcat:
-    uri-encoding: UTF-8
-    max-threads: 1000
-    min-spare-threads: 30
-  servlet:
-    context-path: /
-
 spring:
   datasource:
     druid:
       url: jdbc:mysql://172.30.10.177:3306/micro_security?useUnicode=true&characterEncoding=UTF-8&useSSL=false
-      username: root
-      password: 123456
 
   redis:
     host: 127.0.0.1
@@ -20,35 +10,3 @@ spring:
     timeout: 6000ms  # 连接超时时长（毫秒）
   activiti:
    check-process-definitions: false
-
-zuul:
- routes:
-   ignoredPatterns: /actuator/health,
-#   backstage:
-#     path: /api/**
-#     serviceId: micro-project-as-pay-operation
-#     stripPrefix: true
-#   backmch:
-#     path: /mch/**
-#     serviceId: micro-project-as-pay-merchant
-#     stripPrefix: true
-   payfake:
-     path: /pay/searchorder/**
-     serviceId: micro-project-scheduler-pay-fake
-     stripPrefix: true
-
-   login:
-     path: /login/**
-     url: forward:/login
-   logout:
-     path: /logout/**
-     url: forward:/logout
-   captcha:
-     path: /captcha/**
-     url: forward:/captcha
-   sys:
-     path: /sys/**
-     url: forward:/sys
-   all:
-     path: /**
-     serviceId: micro-project-as-pay-operation
\ No newline at end of file

src/main/resources/application-pre.yml

+spring:
+  datasource:
+    druid:
+      url: jdbc:mysql://172.30.10.152:3306/micro_security?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+      username: micro_security
+      password: dbmca!core@prod

src/main/resources/application-prod.yml

-server:
-  tomcat:
-    uri-encoding: UTF-8
-    max-threads: 1000
-    min-spare-threads: 30
-  servlet:
-    context-path: /
-
 spring:
   datasource:
     druid:
@@ -20,36 +12,3 @@ spring:
     timeout: 6000ms  # 连接超时时长（毫秒）
   activiti:
    check-process-definitions: false
-
-zuul:
- routes:
-   ignoredPatterns:  /swagger-ui.html, /actuator/health
-#   backstage:
-#     path: /api/**
-#     serviceId: micro-project-as-pay-operation
-#     stripPrefix: false
-#   backmch:
-#     path: /mch/**
-#     serviceId: micro-project-as-pay-merchant
-#     stripPrefix: true
-   payfake:
-     path: /pay/searchorder/**
-     serviceId: micro-project-scheduler-pay-fake
-     stripPrefix: true
-
-   login:
-     path: /login/**
-     url: forward:/login
-   logout:
-     path: /logout/**
-     url: forward:/logout
-   captcha:
-     path: /captcha/**
-     url: forward:/captcha
-   sys:
-     path: /sys/**
-     url: forward:/sys
-   all:
-     path: /**
-     serviceId: micro-project-as-pay-operation
-

src/main/resources/application-test.yml

-server:
-  tomcat:
-    uri-encoding: UTF-8
-    max-threads: 1000
-    min-spare-threads: 30
-  servlet:
-    context-path: /
-
 spring:
   datasource:
     druid:
       url: jdbc:mysql://172.30.10.127:3306/micro_security?useUnicode=true&characterEncoding=UTF-8&useSSL=false
-      username: root
-      password: 123456
-
-  redis:
-    host: 127.0.0.1
-    port: 6379
-    #password:    # 密码（默认为空）
-    timeout: 6000ms  # 连接超时时长（毫秒）
-  activiti:
-   check-process-definitions: false
-zuul:
- routes:
-   ignoredPatterns: /actuator/health
-#   backstage:
-#     path: /api/**
-#     serviceId: micro-project-as-pay-operation
-#     stripPrefix: true
-#   backmch:
-#     path: /mch/**
-#     serviceId: micro-project-as-pay-merchant
-#     stripPrefix: true
-   payfake:
-     path: /pay/searchorder/**
-     serviceId: micro-project-scheduler-pay-fake
-     stripPrefix: true
-   login:
-     path: /login/**
-     url: forward:/login
-   logout:
-     path: /logout/**
-     url: forward:/logout
-   captcha:
-     path: /captcha/**
-     url: forward:/captcha
-   sys:
-     path: /sys/**
-     url: forward:/sys
-   all:
-     path: /**
-     serviceId: micro-project-as-pay-operation
-

src/main/resources/application-uat.yml

-server:
-  tomcat:
-    uri-encoding: UTF-8
-    max-threads: 1000
-    min-spare-threads: 30
-  servlet:
-    context-path: /
-
 spring:
   datasource:
     druid:
@@ -13,41 +5,3 @@ spring:
       username: root
       password: dbroot&mcp.uat_
 
-  redis:
-    host: 127.0.0.1
-    port: 6379
-    #password:    # 密码（默认为空）
-    timeout: 6000ms  # 连接超时时长（毫秒）
-  activiti:
-   check-process-definitions: false
-zuul:
- routes:
-   ignoredPatterns: /actuator/health
-#   backstage:
-#     path: /api/**
-#     serviceId: micro-project-as-pay-operation
-#     stripPrefix: true
-#   backmch:
-#     path: /mch/**
-#     serviceId: micro-project-as-pay-merchant
-#     stripPrefix: true
-   payfake:
-     path: /pay/searchorder/**
-     serviceId: micro-project-scheduler-pay-fake
-     stripPrefix: true
-   login:
-     path: /login/**
-     url: forward:/login
-   logout:
-     path: /logout/**
-     url: forward:/logout
-   captcha:
-     path: /captcha/**
-     url: forward:/captcha
-   sys:
-     path: /sys/**
-     url: forward:/sys
-   all:
-     path: /**
-     serviceId: micro-project-as-pay-operation
-

src/main/resources/application.yml

 server:
-  tomcat:
-    uri-encoding: UTF-8
-    max-threads: 1000
-    min-spare-threads: 30
   servlet:
     context-path: /
   port: 6016
@@ -10,6 +6,8 @@ server:
 spring:
   datasource:
     druid:
+      username: root
+      password: 123456
       initial-size: 10
       max-active: 100
       min-idle: 10
@@ -36,14 +34,6 @@ spring:
           config:
             multi-statement-allow: true
 
-
-  redis:
-    host: 127.0.0.1
-    port: 6379
-    #password:    # 密码（默认为空）
-    timeout: 6000ms  # 连接超时时长（毫秒）
-
-
 #mybatis
 mybatis-plus:
   mapper-locations: classpath*:mapper/**/*.xml
@@ -65,3 +55,27 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
     call-setters-on-nulls: true
+
+
+zuul:
+  routes:
+    ignoredPatterns: /actuator/health,
+    payfake:
+      path: /pay/searchorder/**
+      serviceId: micro-project-scheduler-pay-fake
+      stripPrefix: true
+    login:
+      path: /login/**
+      url: forward:/login
+    logout:
+      path: /logout/**
+      url: forward:/logout
+    captcha:
+      path: /captcha/**
+      url: forward:/captcha
+    sys:
+      path: /sys/**
+      url: forward:/sys
+    all:
+      path: /**
+      serviceId: micro-project-as-pay-operation
\ No newline at end of file

target/classes/application-dev.yml

-server:
-  tomcat:
-    uri-encoding: UTF-8
-    max-threads: 1000
-    min-spare-threads: 30
-  servlet:
-    context-path: /
-
-spring:
-  datasource:
-    druid:
-      url: jdbc:mysql://172.30.10.177:3306/micro_security?useUnicode=true&characterEncoding=UTF-8&useSSL=false
-      username: root
-      password: 123456
-
-  redis:
-    host: 127.0.0.1
-    port: 6379
-    #password:     # 密码（默认为空）
-    timeout: 6000ms  # 连接超时时长（毫秒）
-  activiti:
-   check-process-definitions: false
-
-zuul:
- routes:
-   ignoredPatterns: /actuator/health,
-#   backstage:
-#     path: /api/**
-#     serviceId: micro-project-as-pay-operation
-#     stripPrefix: true
-#   backmch:
-#     path: /mch/**
-#     serviceId: micro-project-as-pay-merchant
-#     stripPrefix: true
-   payfake:
-     path: /pay/searchorder/**
-     serviceId: micro-project-scheduler-pay-fake
-     stripPrefix: true
-
-   login:
-     path: /login/**
-     url: forward:/login
-   logout:
-     path: /logout/**
-     url: forward:/logout
-   captcha:
-     path: /captcha/**
-     url: forward:/captcha
-   sys:
-     path: /sys/**
-     url: forward:/sys
-   all:
-     path: /**
-     serviceId: micro-project-as-pay-operation
\ No newline at end of file

target/classes/application-prod.yml

-server:
-  tomcat:
-    uri-encoding: UTF-8
-    max-threads: 1000
-    min-spare-threads: 30
-  servlet:
-    context-path: /
-
-spring:
-  datasource:
-    druid:
-      url: jdbc:mysql:// 10.113.8.24:3306/micro_security?useUnicode=true&characterEncoding=UTF-8&useSSL=false
-      username: micr_auth
-      password: dbclean&1st->$
-
-  redis:
-    host: 10.113.8.22
-    port: 6379
-    #password:    # 密码（默认为空）
-    timeout: 6000ms  # 连接超时时长（毫秒）
-  activiti:
-   check-process-definitions: false
-
-zuul:
- routes:
-   ignoredPatterns:  /swagger-ui.html, /actuator/health
-#   backstage:
-#     path: /api/**
-#     serviceId: micro-project-as-pay-operation
-#     stripPrefix: false
-#   backmch:
-#     path: /mch/**
-#     serviceId: micro-project-as-pay-merchant
-#     stripPrefix: true
-   payfake:
-     path: /pay/searchorder/**
-     serviceId: micro-project-scheduler-pay-fake
-     stripPrefix: true
-
-   login:
-     path: /login/**
-     url: forward:/login
-   logout:
-     path: /logout/**
-     url: forward:/logout
-   captcha:
-     path: /captcha/**
-     url: forward:/captcha
-   sys:
-     path: /sys/**
-     url: forward:/sys
-   all:
-     path: /**
-     serviceId: micro-project-as-pay-operation
-

target/classes/application-test.yml

-server:
-  tomcat:
-    uri-encoding: UTF-8
-    max-threads: 1000
-    min-spare-threads: 30
-  servlet:
-    context-path: /
-
-spring:
-  datasource:
-    druid:
-      url: jdbc:mysql://172.30.10.127:3306/micro_security?useUnicode=true&characterEncoding=UTF-8&useSSL=false
-      username: root
-      password: 123456
-
-  redis:
-    host: 127.0.0.1
-    port: 6379
-    #password:    # 密码（默认为空）
-    timeout: 6000ms  # 连接超时时长（毫秒）
-  activiti:
-   check-process-definitions: false
-zuul:
- routes:
-   ignoredPatterns: /actuator/health
-#   backstage:
-#     path: /api/**
-#     serviceId: micro-project-as-pay-operation
-#     stripPrefix: true
-#   backmch:
-#     path: /mch/**
-#     serviceId: micro-project-as-pay-merchant
-#     stripPrefix: true
-   payfake:
-     path: /pay/searchorder/**
-     serviceId: micro-project-scheduler-pay-fake
-     stripPrefix: true
-   login:
-     path: /login/**
-     url: forward:/login
-   logout:
-     path: /logout/**
-     url: forward:/logout
-   captcha:
-     path: /captcha/**
-     url: forward:/captcha
-   sys:
-     path: /sys/**
-     url: forward:/sys
-   all:
-     path: /**
-     serviceId: micro-project-as-pay-operation
-

target/classes/application-uat.yml

-server:
-  tomcat:
-    uri-encoding: UTF-8
-    max-threads: 1000
-    min-spare-threads: 30
-  servlet:
-    context-path: /
-
-spring:
-  datasource:
-    druid:
-      url: jdbc:mysql://192.168.75.67:3306/micro_security?useUnicode=true&characterEncoding=UTF-8&useSSL=false
-      username: root
-      password: dbroot&mcp.uat_
-
-  redis:
-    host: 127.0.0.1
-    port: 6379
-    #password:    # 密码（默认为空）
-    timeout: 6000ms  # 连接超时时长（毫秒）
-  activiti:
-   check-process-definitions: false
-zuul:
- routes:
-   ignoredPatterns: /actuator/health
-#   backstage:
-#     path: /api/**
-#     serviceId: micro-project-as-pay-operation
-#     stripPrefix: true
-#   backmch:
-#     path: /mch/**
-#     serviceId: micro-project-as-pay-merchant
-#     stripPrefix: true
-   payfake:
-     path: /pay/searchorder/**
-     serviceId: micro-project-scheduler-pay-fake
-     stripPrefix: true
-   login:
-     path: /login/**
-     url: forward:/login
-     logout:
-       path: /logout/**
-       url: forward:/logout
-     captcha:
-       path: /captcha/**
-       url: forward:/captcha
-     sys:
-       path: /sys/**
-       url: forward:/sys
-     all:
-       path: /**
-       serviceId: micro-project-as-pay-operation
-

target/classes/application.yml

-server:
-  tomcat:
-    uri-encoding: UTF-8
-    max-threads: 1000
-    min-spare-threads: 30
-  servlet:
-    context-path: /
-  port: 6016
-
-spring:
-  datasource:
-    druid:
-      initial-size: 10
-      max-active: 100
-      min-idle: 10
-      max-wait: 60000
-      pool-prepared-statements: true
-      max-pool-prepared-statement-per-connection-size: 20
-      time-between-eviction-runs-millis: 60000
-      min-evictable-idle-time-millis: 300000
-      #validation-query: SELECT 1 FROM DUAL
-      test-while-idle: true
-      test-on-borrow: false
-      test-on-return: false
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        #login-username: admin
-        #login-password: admin
-      filter:
-        stat:
-          log-slow-sql: true
-          slow-sql-millis: 1000
-          merge-sql: false
-        wall:
-          config:
-            multi-statement-allow: true
-
-
-  redis:
-    host: 127.0.0.1
-    port: 6379
-    #password:    # 密码（默认为空）
-    timeout: 6000ms  # 连接超时时长（毫秒）
-
-
-#mybatis
-mybatis-plus:
-  mapper-locations: classpath*:mapper/**/*.xml
-  #实体扫描，多个package用逗号或者分号分隔
-  typeAliasesPackage: com.ost.micro.entity
-  global-config:
-    #数据库相关配置
-    db-config:
-      #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
-      id-type: UUID
-      #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
-      field-strategy: NOT_NULL
-      #驼峰下划线转换
-      column-underline: true
-      #db-type: mysql
-    banner: false
-  #原生配置
-  configuration:
-    map-underscore-to-camel-case: true
-    cache-enabled: false
-    call-setters-on-nulls: true

target/classes/bootstrap.yml

-spring:
-  profiles:
-      active: dev
-  application:
-    name: micro-project.context.micro-security
-  cloud:
-    consul:
-      host: 172.30.10.177
-      port: 8500
\ No newline at end of file