no message

db/Dockerfile

@@ -0,0 +1,11 @@
+FROM mysql/mysql-server:8.0.32
+
+ENV TZ=Asia/Shanghai
+
+RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+COPY ./kxs.sql /docker-entrypoint-initdb.d
+
+COPY ./kxs_codegen.sql /docker-entrypoint-initdb.d
+
+COPY ./kxs_job.sql /docker-entrypoint-initdb.d

docker-compose.yml

@@ -0,0 +1,97 @@
+version: '3'
+services:
+  kxs-mysql:
+    build:
+      context: ./db
+    environment:
+      MYSQL_ROOT_HOST: "%"
+      MYSQL_ROOT_PASSWORD: root
+    restart: always
+    container_name: kxs-mysql
+    image: kxs-mysql
+    ports:
+      - 3306:3306
+    volumes:
+      - ./data/mysql/conf:/etc/mysql/conf.d
+      - ./data/mysql/logs:/logs
+      - ./data/mysql/data:/var/lib/mysql
+    networks:
+      - kxs_default
+
+  kxs-redis:
+    image: redis:7.0.6
+    ports:
+      - 6379:6379
+    restart: always
+    container_name: kxs-redis
+    hostname: kxs-redis
+    networks:
+      - kxs_default
+
+  kxs-gateway:
+    build:
+      context: ./kxs-gateway
+    restart: always
+    ports:
+      - 9999:9999
+    container_name: kxs-gateway
+    hostname: kxs-gateway
+    image: kxs-gateway
+    networks:
+      - kxs_default
+
+  kxs-system:
+    build:
+      context: ./kxs-system/kxs-system-biz
+    restart: always
+    container_name: kxs-system
+    hostname: kxs-system
+    image: kxs-system
+    volumes:
+      - ./logs/kxs-system-biz:/kxs-system-biz/logs
+    networks:
+      - kxs_default
+
+  kxs-codegen:
+    build:
+      context: ./kxs-visual/kxs-codegen
+    restart: always
+    container_name: kxs-codegen
+    hostname: kxs-codegen
+    image: kxs-codegen
+    volumes:
+      - ./logs/kxs-codegen:/kxs-codegen/logs
+    networks:
+      - kxs_default
+
+  kxs-daemon-quartz:
+    build:
+      context: ./kxs-visual/kxs-quartz
+    restart: always
+    image: kxs-quartz
+    container_name: kxs-quartz
+    networks:
+      - kxs_default
+
+#  kxs-rabbitmq:
+#    image: rabbitmq:3.12.8
+#    container_name: kxs-rabbitmq
+#    restart: always
+#    volumes:
+#      - "/usr/share/zoneinfo/Asia/Shanghai:/etc/localtime"        #设置系统时区
+#      - "/usr/share/zoneinfo/Asia/Shanghai:/etc/timezone"  #设置时区
+#      - "./data/rabbit/:/var/lib/rabbitmq/"
+#      - "./logs/rabbit:/var/log/rabbitmq/"
+#    ports:
+#      - 5672:5672
+#      - 15672:15672
+#    environment:
+#      - RABBITMQ_DEFAULT_USER=admin
+#      - RABBITMQ_DEFAULT_PASS=admin
+#    networks:
+#      - kxs_default
+
+
+networks:
+  kxs_default:
+    driver: bridge

kxs-codegen/Dockerfile

@@ -6,7 +6,7 @@ ARG JAR_FILE=target/sky-codegen.jar
 
 COPY ${JAR_FILE} app.jar
 
-EXPOSE 5002
+EXPOSE 4002
 
 ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
 

kxs-common/kxs-common-security/src/main/java/com/kxs/common/security/component/SkyCustomOpaqueTokenIntrospector.java

@@ -1,11 +1,8 @@
 package com.kxs.common.security.component;
 
-import cn.hutool.extra.spring.SpringUtil;
 import com.kxs.common.security.model.KxsUser;
-import com.kxs.common.security.service.KxsUserDetailsService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.core.Ordered;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
@@ -18,10 +15,7 @@ import org.springframework.security.oauth2.server.resource.InvalidBearerTokenExc
 import org.springframework.security.oauth2.server.resource.introspection.OpaqueTokenIntrospector;
 
 import java.security.Principal;
-import java.util.Comparator;
-import java.util.Map;
 import java.util.Objects;
-import java.util.Optional;
 
 /**
  * @author 没秃顶的码农
@@ -46,15 +40,6 @@ public class SkyCustomOpaqueTokenIntrospector implements OpaqueTokenIntrospector
 					AuthorityUtils.NO_AUTHORITIES, oldAuthorization.getPrincipalName());
 		}
 
-		Map<String, KxsUserDetailsService> userDetailsServiceMap = SpringUtil
-			.getBeansOfType(KxsUserDetailsService.class);
-
-		Optional<KxsUserDetailsService> optional = userDetailsServiceMap.values()
-			.stream()
-			.filter(service -> service.support(Objects.requireNonNull(oldAuthorization).getRegisteredClientId(),
-					oldAuthorization.getAuthorizationGrantType().getValue()))
-			.max(Comparator.comparingInt(Ordered::getOrder));
-
 		try {
 
 			// 获取用户信息

kxs-common/kxs-common-security/src/main/java/com/kxs/common/security/service/KxsUserDetailsService.java

@@ -29,13 +29,4 @@ public interface KxsUserDetailsService extends UserDetailsService, Ordered {
 		return 0;
 	}
 
-	/**
-	 * 通过用户实体查询
-	 * @param kxsUser user
-	 * @return 用户详细信息
-	 */
-	default UserDetails loadUserByUser(KxsUser kxsUser) {
-		return this.loadUserByUsername(kxsUser.getUsername());
-	}
-
 }

kxs-common/kxs-common-security/src/main/java/com/kxs/common/security/service/KxsUserDetailsServiceImpl.java

@@ -1,7 +1,7 @@
 package com.kxs.common.security.service;
 
+import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.StrUtil;
 import com.kxs.common.core.constant.CacheConstants;
 import com.kxs.common.core.constant.CommonConstants;
 import com.kxs.common.core.constant.SecurityConstants;
@@ -103,7 +103,7 @@ public class KxsUserDetailsServiceImpl implements KxsUserDetailsService {
 
 		// 构造security用户
 		return new KxsUser(user.getUserId(), user.getUsername(), SecurityConstants.BCRYPT + user.getPassword(),
-				user.getPhone(), true, true, true, StrUtil.equals(user.getLockFlag(), CommonConstants.STATUS_NORMAL),
+				user.getPhone(), true, true, true, CharSequenceUtil.equals(user.getLockFlag(), CommonConstants.STATUS_NORMAL),
 				authorities);
 	}
 

kxs-gateway/Dockerfile

@@ -0,0 +1,16 @@
+FROM alibabadragonwell/dragonwell:17-anolis
+
+WORKDIR /sky-gateway
+
+ARG JAR_FILE=target/sky-gateway.jar
+
+COPY ${JAR_FILE} app.jar
+
+EXPOSE 9999
+
+ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
+
+ENV LANG=C.UTF-8
+ENV LC_ALL=C.UTF-8
+
+CMD sleep 60; java $JAVA_OPTS -jar app.jar

kxs-gateway/src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ spring:
         simple:
           instances:
             kxs-system-biz: #负载均衡
-              - uri: http://127.0.0.1:8080
+              - uri: http://127.0.0.1:8888
             kxs-codegen:
               - uri: http://127.0.0.1:4002
             kxs-quartz:

kxs-quartz/Dockerfile

@@ -0,0 +1,13 @@
+FROM alibabadragonwell/dragonwell:17-anolis
+
+WORKDIR /sky-quartz
+
+ARG JAR_FILE=target/sky-quartz.jar
+
+COPY ${JAR_FILE} app.jar
+
+EXPOSE 4000
+
+ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
+
+CMD sleep 60; java $JAVA_OPTS -jar app.jar

kxs-system/kxs-system-biz/Dockerfile

@@ -0,0 +1,13 @@
+FROM alibabadragonwell/dragonwell:17-anolis
+
+WORKDIR /sky-upms-biz
+
+ARG JAR_FILE=target/sky-upms-biz.jar
+
+COPY ${JAR_FILE} app.jar
+
+EXPOSE 8888
+
+ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
+
+CMD sleep 60; java $JAVA_OPTS -jar app.jar

kxs-system/kxs-system-biz/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8888
 
 spring:
   profiles: