Skip to content

R
roncoo-education

roncoo / roncoo-education
10 个月 前同步成功

通知 146
Star 5
Fork 0
R
roncoo-education

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 c5e32100 编写于 作者: F fengyongwei
浏览文件
操作

修改模块名称

上级 d96564f4
隐藏空白更改
内联 并排
Showing with 109 addition and 161 deletion
UPDATE.md
浏览文件 @ c5e32100
......@@ -5,7 +5,8 @@
2. 修复课程简介为空不显示课程信息
3. roncoo-education-gateway修改为roncoo-education-server-gateway
4. roncoo-education-job修改为roncoo-education-server-job
5.
5. roncoo-education-server-admin修改为roncoo-education-server-sba
###### v6.0.0-RELEASE -- 2020.01.28
1. 修改网关配置开发环境地址与测试环境地址一致
......
pom.xml
浏览文件 @ c5e32100
......@@ -332,7 +332,7 @@
<!-- 配置中心 -->
<module>roncoo-education-server-config</module>
<!-- 监控中心 -->
<module>roncoo-education-server-admin</module>
<module>roncoo-education-server-sba</module>
<!-- 基础工程 -->
<module>roncoo-education-util</module>
<!-- 系统管理 -->
......
roncoo-education-server-config/src/main/resources/config/master/application-dev.properties
浏览文件 @ c5e32100
# \u73AF\u5883\u603B\u914D\u7F6E
spring.servlet.multipart.location=/tmp/roncoo-education/
# elasticsearch
......
roncoo-education-server-config/src/main/resources/config/master/application-test.properties
浏览文件 @ c5e32100
# 环境总配置
spring.servlet.multipart.location=/tmp/education/
# elasticsearch
......
roncoo-education-server-config/src/main/resources/config/master/application.properties
浏览文件 @ c5e32100
# \u603B\u914D\u7F6E\uFF0C\u6BCF\u4E2A\u73AF\u5883\u90FD\u4E00\u6837
# logging
logging.config=classpath:logback-roncoo.xml
......
roncoo-education-server-config/src/main/resources/config/master/roncoo-education-course-service-dev.properties
浏览文件 @ c5e32100
# 课程服务模块-开发环境
# mysql
spring.datasource.druid.url=jdbc:mysql://localhost:3306/education_course?useUnicode=true&characterEncoding=utf-8&useSSL=false
spring.datasource.druid.username=roncoo
......
roncoo-education-server-config/src/main/resources/config/master/roncoo-education-course-service-test.properties
浏览文件 @ c5e32100
# 课程服务模块-测试环境
# mysql
spring.datasource.druid.url=jdbc:mysql://localhost:3306/education_course?useUnicode=true&characterEncoding=utf-8&useSSL=false
spring.datasource.druid.username=roncoo
......
roncoo-education-server-config/src/main/resources/config/master/roncoo-education-course-service.properties
浏览文件 @ c5e32100
# 课程模块
# mybatis
mybatis.mapper-locations=classpath:mybatis/*.xml
mybatis.type-aliases-package=com.roncoo.education.course.service.dao.impl.mapper.bean.entity
......
roncoo-education-server-config/src/main/resources/config/master/roncoo-education-gateway-dev.properties 已删除 100644 → 0
浏览文件 @ d96564f4
# Íø¹ØÄ£¿é-¿ª·¢»·¾³
# context-path
server.servlet.context-path=/api
# management
management.server.servlet.context-path=/api
# level
logging.level.com.netflix.loadbalancer=debug
roncoo-education-server-config/src/main/resources/config/master/roncoo-education-gateway-test.properties 已删除 100644 → 0
浏览文件 @ d96564f4
# 网关模块-测试环境
# context-path
server.servlet.context-path=/api
# management
management.server.servlet.context-path=/api
# level
logging.level.com.netflix.loadbalancer=debug
\ No newline at end of file
roncoo-education-server-config/src/main/resources/config/master/roncoo-education-server-admin.properties → roncoo-education-server-config/src/main/resources/config/master/roncoo-education-server-sba.properties
浏览文件 @ c5e32100
# 接口模块
# logging
info.roncoo.logging.path=/home/roncoo/education/logs/server-admin
info.roncoo.logging.path=/home/roncoo/education/logs/sba
# admin
spring.boot.admin.ui.title=\u5e7f\u5dde\u5e02\u9886\u8bfe\u7f51\u7edc\u79d1\u6280\u6709\u9650\u516c\u53f8
roncoo-education-server-config/src/main/resources/config/master/roncoo-education-system-service-dev.properties
浏览文件 @ c5e32100
# 用户服务模块-开发环境
# mysql
spring.datasource.druid.url=jdbc:mysql://localhost:3306/education_system?useUnicode=true&characterEncoding=utf-8&useSSL=false
spring.datasource.druid.username=roncoo
......
roncoo-education-server-config/src/main/resources/config/master/roncoo-education-system-service-test.properties
浏览文件 @ c5e32100
# 用户服务模块-测试环境
# mysql
spring.datasource.druid.url=jdbc:mysql://localhost:3306/education_system?useUnicode=true&characterEncoding=utf-8&useSSL=false
spring.datasource.druid.username=roncoo
......
roncoo-education-server-config/src/main/resources/config/master/roncoo-education-system-service.properties
浏览文件 @ c5e32100
# 用户模块
# mybatis
mybatis.mapper-locations=classpath:mybatis/*.xml
mybatis.type-aliases-package=com.roncoo.education.system.service.dao.impl.mapper.bean.entity
......
roncoo-education-server-config/src/main/resources/config/master/roncoo-education-user-service-dev.properties
浏览文件 @ c5e32100
# 用户服务模块-开发环境
# mysql
spring.datasource.druid.url=jdbc:mysql://localhost:3306/education_user?useUnicode=true&characterEncoding=utf-8&useSSL=false
spring.datasource.druid.username=roncoo
......
roncoo-education-server-config/src/main/resources/config/master/roncoo-education-user-service-test.properties
浏览文件 @ c5e32100
# 用户服务模块-测试环境
# mysql
spring.datasource.druid.url=jdbc:mysql://localhost:3306/education_user?useUnicode=true&characterEncoding=utf-8&useSSL=false
spring.datasource.druid.username=roncoo
......
roncoo-education-server-config/src/main/resources/config/master/roncoo-education-user-service.properties
浏览文件 @ c5e32100
# 用户模块
# mybatis
mybatis.mapper-locations=classpath:mybatis/*.xml
mybatis.type-aliases-package=com.roncoo.education.user.service.dao.impl.mapper.bean.entity
......
roncoo-education-server-gateway/src/main/resources/bootstrap.properties
浏览文件 @ c5e32100
......@@ -12,7 +12,7 @@ eureka.client.serviceUrl.defaultZone=http://${info.eureka.host}:${info.eureka.po
server.port=5840
# application
spring.application.name=roncoo-education-gateway
spring.application.name=roncoo-education-server-gateway
# spring cloud config client
spring.cloud.config.profile=${spring.profiles.active}
......
roncoo-education-server-job/src/main/resources/bootstrap.properties
浏览文件 @ c5e32100
......@@ -13,7 +13,7 @@ eureka.client.serviceUrl.defaultZone=http://${info.eureka.host}:${info.eureka.po
server.port=5920
# application
spring.application.name=roncoo-education-job
spring.application.name=roncoo-education-server-job
# spring cloud config client
spring.cloud.config.profile=${spring.profiles.active}
......
roncoo-education-server-admin/pom.xml → roncoo-education-server-sba/pom.xml
浏览文件 @ c5e32100
......@@ -7,7 +7,7 @@
<version>7.0.0-RELEASE</version>
</parent>
<artifactId>roncoo-education-server-admin</artifactId>
<artifactId>roncoo-education-server-sba</artifactId>
<dependencies>
......@@ -55,7 +55,7 @@
</dependencies>
<build>
<finalName>server-admin</finalName>
<finalName>server-sba</finalName>
<plugins>
<plugin>
......
roncoo-education-server-admin/src/main/java/com/roncoo/education/server/admin/ServerAdminApplication.java → roncoo-education-server-sba/src/main/java/com/roncoo/education/server/sba/ServerAdminApplication.java
浏览文件 @ c5e32100
/**
* Copyright 2015-现在 广州市领课网络科技有限公司
*/
package com.roncoo.education.server.admin;
package com.roncoo.education.server.sba;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
......
roncoo-education-server-admin/src/main/java/com/roncoo/education/server/admin/config/SecuritySecureConfig.java → roncoo-education-server-sba/src/main/java/com/roncoo/education/server/sba/config/SecuritySecureConfig.java
浏览文件 @ c5e32100
package com.roncoo.education.server.admin.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;
import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
import de.codecentric.boot.admin.server.config.AdminServerProperties;
@Configuration
public class SecuritySecureConfig extends WebSecurityConfigurerAdapter {
private final String adminContextPath;
public SecuritySecureConfig(AdminServerProperties adminServerProperties) {
this.adminContextPath = adminServerProperties.getContextPath();
}
@Override
protected void configure(HttpSecurity http) throws Exception {
// @formatter:off
SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler();
successHandler.setTargetUrlParameter("redirectTo");
successHandler.setDefaultTargetUrl(adminContextPath + "/");
http.authorizeRequests().antMatchers(adminContextPath + "/assets/**").permitAll().antMatchers(adminContextPath + "/login").permitAll().anyRequest().authenticated().and().formLogin().loginPage(adminContextPath + "/login").successHandler(successHandler).and().logout().logoutUrl(adminContextPath + "/logout").and().httpBasic().and().csrf().csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse()).ignoringAntMatchers(adminContextPath + "/instances", adminContextPath + "/actuator/**");
// @formatter:on
}
package com.roncoo.education.server.sba.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;
import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
import de.codecentric.boot.admin.server.config.AdminServerProperties;
@Configuration
public class SecuritySecureConfig extends WebSecurityConfigurerAdapter {
private final String adminContextPath;
public SecuritySecureConfig(AdminServerProperties adminServerProperties) {
this.adminContextPath = adminServerProperties.getContextPath();
}
@Override
protected void configure(HttpSecurity http) throws Exception {
// @formatter:off
SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler();
successHandler.setTargetUrlParameter("redirectTo");
successHandler.setDefaultTargetUrl(adminContextPath + "/");
http.authorizeRequests().antMatchers(adminContextPath + "/assets/**").permitAll().antMatchers(adminContextPath + "/login").permitAll().anyRequest().authenticated().and().formLogin().loginPage(adminContextPath + "/login").successHandler(successHandler).and().logout().logoutUrl(adminContextPath + "/logout").and().httpBasic().and().csrf().csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse()).ignoringAntMatchers(adminContextPath + "/instances", adminContextPath + "/actuator/**");
// @formatter:on
}
}
\ No newline at end of file
roncoo-education-server-admin/src/main/resources/bootstrap.properties → roncoo-education-server-sba/src/main/resources/bootstrap.properties
浏览文件 @ c5e32100
......@@ -18,7 +18,7 @@ eureka.instance.metadata-map.user.password=${spring.security.user.password}
server.port=5721
# application
spring.application.name=roncoo-education-server-admin
spring.application.name=roncoo-education-server-sba
# spring cloud config client
spring.cloud.config.profile=${spring.profiles.active}
......
roncoo-education-server-admin/src/main/resources/logback-roncoo.xml → roncoo-education-server-sba/src/main/resources/logback-roncoo.xml
浏览文件 @ c5e32100
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/defaults.xml" />
<springProperty name="springApplicationName" source="spring.application.name" defaultValue="roncoo-education"/>
<springProperty name="FILE_PATH" source="info.roncoo.logging.path" defaultValue="/home/roncoo/logs"/>
<property name="PATTERN" value="%-12(%d{yyyy-MM-dd HH:mm:ss.SSS}) |-%-5level [%thread] %c [%L] -| %msg%n"/>
<!-- 开发环境 -->
<springProfile name="local">
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>${PATTERN}</pattern>
</encoder>
</appender>
<root level="info">
<appender-ref ref="CONSOLE" />
</root>
</springProfile>
<!-- 测试环境 -->
<springProfile name="dev,test">
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>${PATTERN}</pattern>
</encoder>
</appender>
<appender name="TEST-FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 文件路径 -->
<file>${FILE_PATH}/info</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 文件名称 -->
<fileNamePattern>${FILE_PATH}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 文件最大保存历史数量 -->
<MaxHistory>100</MaxHistory>
</rollingPolicy>
<layout class="ch.qos.logback.classic.PatternLayout">
<pattern>${PATTERN}</pattern>
</layout>
</appender>
<root level="info">
<appender-ref ref="CONSOLE" />
<appender-ref ref="TEST-FILE" />
</root>
</springProfile>
<!-- 生产环境 -->
<springProfile name="prod">
<appender name="PROD_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${FILE_PATH}/warn</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${FILE_PATH}/warn.%d{yyyy-MM-dd}.log
</fileNamePattern>
<MaxHistory>100</MaxHistory>
</rollingPolicy>
<layout class="ch.qos.logback.classic.PatternLayout">
<pattern>${PATTERN}</pattern>
</layout>
</appender>
<root level="warn">
<appender-ref ref="PROD_FILE" />
</root>
</springProfile>
</configuration>
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<include resource="org/springframework/boot/logging/logback/defaults.xml" />
<springProperty name="springApplicationName" source="spring.application.name" defaultValue="roncoo-education"/>
<springProperty name="FILE_PATH" source="info.roncoo.logging.path" defaultValue="/home/roncoo/logs"/>
<property name="PATTERN" value="%-12(%d{yyyy-MM-dd HH:mm:ss.SSS}) |-%-5level [%thread] %c [%L] -| %msg%n"/>
<!-- 开发环境 -->
<springProfile name="local">
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>${PATTERN}</pattern>
</encoder>
</appender>
<root level="info">
<appender-ref ref="CONSOLE" />
</root>
</springProfile>
<!-- 测试环境 -->
<springProfile name="dev,test">
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>${PATTERN}</pattern>
</encoder>
</appender>
<appender name="TEST-FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 文件路径 -->
<file>${FILE_PATH}/info</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 文件名称 -->
<fileNamePattern>${FILE_PATH}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 文件最大保存历史数量 -->
<MaxHistory>100</MaxHistory>
</rollingPolicy>
<layout class="ch.qos.logback.classic.PatternLayout">
<pattern>${PATTERN}</pattern>
</layout>
</appender>
<root level="info">
<appender-ref ref="CONSOLE" />
<appender-ref ref="TEST-FILE" />
</root>
</springProfile>
<!-- 生产环境 -->
<springProfile name="prod">
<appender name="PROD_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${FILE_PATH}/warn</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${FILE_PATH}/warn.%d{yyyy-MM-dd}.log
</fileNamePattern>
<MaxHistory>100</MaxHistory>
</rollingPolicy>
<layout class="ch.qos.logback.classic.PatternLayout">
<pattern>${PATTERN}</pattern>
</layout>
</appender>
<root level="warn">
<appender-ref ref="PROD_FILE" />
</root>
</springProfile>
</configuration>
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或