From 2962266fc3d1d17ec41b28dd7e79f2107aa467c5 Mon Sep 17 00:00:00 2001 From: 1095071913 <1095071913@qq.com> Date: Thu, 1 Sep 2022 23:00:57 +0800 Subject: [PATCH] init --- pom.xml | 90 ++++++++----------- .../BootAdminApplication.java | 5 +- src/main/java/com/jiumao/config/Config.java | 39 ++++++++ .../config/SecurityPermitAllConfig.java | 14 +++ .../config/SecuritySecureConfig.java | 2 +- .../ApplicationNameMessageConverter.java | 5 +- .../convert/EnvironmentMessageConverter.java | 4 +- src/main/resources/bootstrap.properties | 12 ++- src/main/resources/log.xml | 23 +++-- 9 files changed, 117 insertions(+), 77 deletions(-) rename src/main/java/com/{zhongshi => jiumao}/BootAdminApplication.java (90%) create mode 100644 src/main/java/com/jiumao/config/Config.java create mode 100644 src/main/java/com/jiumao/config/SecurityPermitAllConfig.java rename src/main/java/com/{zhongshi => jiumao}/config/SecuritySecureConfig.java (99%) rename src/main/java/com/{zhongshi => jiumao}/log/convert/ApplicationNameMessageConverter.java (69%) rename src/main/java/com/{zhongshi => jiumao}/log/convert/EnvironmentMessageConverter.java (77%) diff --git a/pom.xml b/pom.xml index 7d23a05..c18e0f4 100644 --- a/pom.xml +++ b/pom.xml @@ -3,22 +3,23 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.zhongshi - zhongshi-etc-parent + com.jiumao + jiumao-saas-parent 1.5.0-SNAPSHOT - 1.6.0-ZHONGSHI-SNAPSHOT - zhongshi-etc-basics-bootadmin + jiumao-saas-basics-bootadmin + 1.0.0-SNAPSHOT - com.zhongshi.BootAdminApplication + com.jiumao.BootAdminApplication - + + de.codecentric @@ -30,6 +31,11 @@ io.micrometer micrometer-registry-prometheus + + @@ -46,17 +52,20 @@ com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery - - + + + org.codehaus.janino + janino + - com.zhongshi - zhongshi-etc-config-mvc - ${zhongshi-etc-config-mvc.version} + com.jiumao + jiumao-saas-config-mvc + ${jiumao-saas-config-mvc.version} org.springframework.cloud @@ -66,9 +75,9 @@ - com.zhongshi - zhongshi-etc-service-base-run - ${zhongshi-etc-service-base-run.version} + com.jiumao + jiumao-saas-service-base-run + ${jiumao-saas-service-base-run.version} org.springframework.cloud @@ -90,54 +99,23 @@ - - - - local - - - ${NACOS_CONFIG_SERVER:localhost:8848} - - - true - - - - dev - - - ${NACOS_CONFIG_SERVER:47.115.156.57:8848} - - - - test - - - ${NACOS_CONFIG_SERVER:120.24.24.164:8848} - - - - - - - + + + + @@ -200,4 +180,6 @@ + + diff --git a/src/main/java/com/zhongshi/BootAdminApplication.java b/src/main/java/com/jiumao/BootAdminApplication.java similarity index 90% rename from src/main/java/com/zhongshi/BootAdminApplication.java rename to src/main/java/com/jiumao/BootAdminApplication.java index e5ecd3e..88d19cb 100644 --- a/src/main/java/com/zhongshi/BootAdminApplication.java +++ b/src/main/java/com/jiumao/BootAdminApplication.java @@ -15,9 +15,7 @@ * */ -package com.zhongshi; - -import de.codecentric.boot.admin.server.config.EnableAdminServer; +package com.jiumao; /** * @@ -33,7 +31,6 @@ * */ -@EnableAdminServer public class BootAdminApplication extends BaseApplication { public static void main(String[] args) { diff --git a/src/main/java/com/jiumao/config/Config.java b/src/main/java/com/jiumao/config/Config.java new file mode 100644 index 0000000..cf7ad6c --- /dev/null +++ b/src/main/java/com/jiumao/config/Config.java @@ -0,0 +1,39 @@ +/* + * Copyright 2012-2018 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package com.jiumao.config; + +import org.springframework.context.annotation.Configuration; +import de.codecentric.boot.admin.server.config.EnableAdminServer; + +/** + * + * Specifications：功能 + * + * Author：彭晋龙 + * + * Creation Date：2021-12-18:16:32:34 + * + * Copyright Ownership：xiao mao zi + * + * Agreement That：Apache 2.0 + * + */ + +@Configuration +@EnableAdminServer +public class Config {} diff --git a/src/main/java/com/jiumao/config/SecurityPermitAllConfig.java b/src/main/java/com/jiumao/config/SecurityPermitAllConfig.java new file mode 100644 index 0000000..394128d --- /dev/null +++ b/src/main/java/com/jiumao/config/SecurityPermitAllConfig.java @@ -0,0 +1,14 @@ +//package com.jiumao.config; +// +//import org.springframework.context.annotation.Configuration; +//import org.springframework.security.config.annotation.web.builders.HttpSecurity; +//import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +// +//@Configuration +//public class SecurityPermitAllConfig extends WebSecurityConfigurerAdapter { +// @Override +// protected void configure(HttpSecurity http) throws Exception { +// http.authorizeRequests().anyRequest().permitAll() +// .and().csrf().disable(); +// } +//} \ No newline at end of file diff --git a/src/main/java/com/zhongshi/config/SecuritySecureConfig.java b/src/main/java/com/jiumao/config/SecuritySecureConfig.java similarity index 99% rename from src/main/java/com/zhongshi/config/SecuritySecureConfig.java rename to src/main/java/com/jiumao/config/SecuritySecureConfig.java index 93c80e0..88e8aa6 100644 --- a/src/main/java/com/zhongshi/config/SecuritySecureConfig.java +++ b/src/main/java/com/jiumao/config/SecuritySecureConfig.java @@ -1,4 +1,4 @@ -//package com.zhongshi.config; +//package com.jiumao.config; // //import java.util.UUID; // diff --git a/src/main/java/com/zhongshi/log/convert/ApplicationNameMessageConverter.java b/src/main/java/com/jiumao/log/convert/ApplicationNameMessageConverter.java similarity index 69% rename from src/main/java/com/zhongshi/log/convert/ApplicationNameMessageConverter.java rename to src/main/java/com/jiumao/log/convert/ApplicationNameMessageConverter.java index ccdc1e9..f51ea9c 100644 --- a/src/main/java/com/zhongshi/log/convert/ApplicationNameMessageConverter.java +++ b/src/main/java/com/jiumao/log/convert/ApplicationNameMessageConverter.java @@ -1,7 +1,6 @@ -package com.zhongshi.log.convert; +package com.jiumao.log.convert; -import com.zhongshi.factory.BaseResultFactory; -import com.zhongshi.tool.ApplicationEnvironmentConfig; +import com.jiumao.tool.ApplicationEnvironmentConfig; import ch.qos.logback.classic.pattern.MessageConverter; import ch.qos.logback.classic.spi.ILoggingEvent; diff --git a/src/main/java/com/zhongshi/log/convert/EnvironmentMessageConverter.java b/src/main/java/com/jiumao/log/convert/EnvironmentMessageConverter.java similarity index 77% rename from src/main/java/com/zhongshi/log/convert/EnvironmentMessageConverter.java rename to src/main/java/com/jiumao/log/convert/EnvironmentMessageConverter.java index caa4593..e32f916 100644 --- a/src/main/java/com/zhongshi/log/convert/EnvironmentMessageConverter.java +++ b/src/main/java/com/jiumao/log/convert/EnvironmentMessageConverter.java @@ -1,6 +1,6 @@ -package com.zhongshi.log.convert; +package com.jiumao.log.convert; -import com.zhongshi.tool.ApplicationEnvironmentConfig; +import com.jiumao.tool.ApplicationEnvironmentConfig; import ch.qos.logback.classic.pattern.MessageConverter; import ch.qos.logback.classic.spi.ILoggingEvent; diff --git a/src/main/resources/bootstrap.properties b/src/main/resources/bootstrap.properties index 150227f..e1f4cfa 100644 --- a/src/main/resources/bootstrap.properties +++ b/src/main/resources/bootstrap.properties @@ -1,12 +1,10 @@ -spring.application.name=zhongshi-etc-bootadmin +spring.application.name=jiumao-saas-bootadmin spring.cloud.nacos.config.file-extension=yml -spring.cloud.nacos.config.server-addr=localhost:8848 +spring.cloud.nacos.config.server-addr=${NACOS_CONFIG_SERVER:localhost:8848} spring.cloud.nacos.config.shared-dataids=cloud-default.yml,cloud-nacos.yml,boot-admin.yml #spring.cloud.nacos.config.refreshable-dataids -spring.main.allow-bean-definition-overriding=true - logging.level.root=ERROR -logging.level.com.zhongshi=INFO -logging.config=classpath:log.xml -logging.file.name=${LOG_PATH:log.log} \ No newline at end of file +logging.level.com.jiumao=INFO +logging.file.name=log/log.log +logging.config=classpath:log.xml \ No newline at end of file diff --git a/src/main/resources/log.xml b/src/main/resources/log.xml index 96f4221..4a9961b 100644 --- a/src/main/resources/log.xml +++ b/src/main/resources/log.xml @@ -6,8 +6,10 @@ - - + + + + @@ -42,10 +44,10 @@ - ${LOG_PATH:-./log.log} + log/log.log - log-%d{yyyy-MM-dd}.log + log/%d{yyyy-MM-dd}-log.log 30 @@ -219,9 +221,18 @@ - - + + + + + + + + + + +