Git地址

https://github.com/MrFeng92?tab=repositories
课程随堂代码：https://gitee.com/daniel1996/kuangspringcloud

https://blog.csdn.net/weixin_43591980/article/details/106255122

git branch 查看分支
git branch 1.0 创建1.0分支
git checkout 1.0 切换分支
git push origin 1.0 提交分支代码到github
合并分支
1、切回主干
git checkout master
2、合并分支
git merge 1.0

IDEA操作Git 提交代码到远程仓库
1、创建本地仓库
VCS->import into VC->Create git repository
2、commit
3、添加远程仓库地址
VSC->GIT->remotes 添加地址
4、提交代码到远程仓库
VSC->GIT->push

克隆项目
vcs->Get from VC

IDEA创建分支
1、右下角新建分支
合并分支
1、右下角 切换到主分支 再merger

代码冲突怎么办
merge最保险，千万别点上面两个，别背锅

package com.fs.config;

import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.support.http.StatViewServlet;
import com.alibaba.druid.support.http.WebStatFilter;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.boot.web.servlet.ServletRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

import javax.servlet.FilterRegistration;
import javax.servlet.ServletRegistration;
import javax.sql.DataSource;
import java.util.HashMap;
import java.util.Map;

@Configuration
public class DruidConfig
{
@ConfigurationProperties(prefix = “spring.datasource”)
@Bean
public DataSource druidDataSource()
{
return new DruidDataSource();
}

//后台监控,因为springboot内置了servlet容器，所以没有web.xml，替代方法：@Bean想要什么new什么
@Bean
public ServletRegistrationBean statViewServlet()
{
    ServletRegistrationBean<StatViewServlet> bean = new ServletRegistrationBean<>(new StatViewServlet(), "/druid/*");
    //后台需要有人登录
    Map<String, String> initParams=new HashMap<String, String>();
    //增加配置
    initParams.put("loginUsername","admin");//固定key参数名
    initParams.put("loginPassword","123456");

    //允许那些地址可以访问
    initParams.put("allow","");//不些，就是谁都可以访问

    bean.setInitParameters(initParams);//设置初始化参数

    return bean;
}

//过滤器
@Bean
public FilterRegistrationBean webFilter(){
    FilterRegistrationBean bean=new FilterRegistrationBean();
    bean.setFilter(new WebStatFilter());

    //配置需要过滤的地址
    Map<String, String> initParams=new HashMap<String, String>();
    //这些不进行过滤
    initParams.put("exclusions","*.js,*.css,/druid/*");
    bean.setInitParameters(initParams);
    return bean;
}

}