diff --git a/src/main/java/cn/xf/basedemo/config/WebMvcConfig.java b/src/main/java/cn/xf/basedemo/config/WebMvcConfig.java deleted file mode 100644 index 9c61b55..0000000 --- a/src/main/java/cn/xf/basedemo/config/WebMvcConfig.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.xf.basedemo.config; - -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; - -/** - * @program: xf-boot-base - * @ClassName WebMvcConfig - * @description: 放行Knife4j请求 - * @author: xiongfeng - * @create: 2022-07-26 11:17 - **/ -@Configuration -public class WebMvcConfig extends WebMvcConfigurationSupport { - - @Override - public void addResourceHandlers(ResourceHandlerRegistry registry) { - registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/"); - registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/"); - } - -} \ No newline at end of file diff --git a/src/main/java/cn/xf/basedemo/model/domain/User.java b/src/main/java/cn/xf/basedemo/model/domain/User.java index c299fbe..c506b2f 100644 --- a/src/main/java/cn/xf/basedemo/model/domain/User.java +++ b/src/main/java/cn/xf/basedemo/model/domain/User.java @@ -1,5 +1,6 @@ package cn.xf.basedemo.model.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -26,5 +27,6 @@ public class User { private String phone; + @TableField(value = "create_time") private Date createTime; } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index aaa71ef..4aef6ec 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -10,18 +10,18 @@ spring: connection-test-query: SELECT 1 datasource: master: #${SERVER_ADDRESS} - url: jdbc:mysql://120.48.109.209:3306/xf-boot-base?useUnicode=true&characterEncoding=utf-8&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://117.72.35.70:3307/xf-boot-base?useUnicode=true&characterEncoding=utf-8&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai username: root password: 123456 driver-class-name: com.mysql.cj.jdbc.Driver slave: - url: jdbc:mysql://120.48.109.209:3306/xf-boot-base?useUnicode=true&characterEncoding=utf-8&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai + url: jdbc:mysql://117.72.35.70:3307/xf-boot-base?useUnicode=true&characterEncoding=utf-8&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai username: root password: 123456 driver-class-name: com.mysql.cj.jdbc.Driver redis: port: 6379 #Redis服务器连接的端口 - host: 120.48.109.209 # Redis服务器的地址 + host: 117.72.35.70 # Redis服务器的地址 password: 123456 # Redis服务器连接密码(默认为空) timeout: 5000 # 连接超时时间(毫秒) lettuce: #参考博客 https://blog.csdn.net/weixin_43944305/article/details/124322595 diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 5828405..17f80de 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -54,7 +54,7 @@ var json = JSON.stringify(data); var cipher = this.encryptByPublicKey(json); console.log("密文 :" + cipher); - var url = "http://120.48.109.209:8088/user/login"; + var url = "http://117.72.35.70:8088/user/login"; axios.post(url, { encryptedData: cipher, }) diff --git a/src/main/resources/templates/success.html b/src/main/resources/templates/success.html index 9e70912..859ebf4 100644 --- a/src/main/resources/templates/success.html +++ b/src/main/resources/templates/success.html @@ -25,6 +25,7 @@ name: '' }, mounted: function () { + this.token = this.getData("token"); //只需要转一次码 this.name = decodeURI(this.getData("name")); @@ -33,8 +34,10 @@ getData: function (name) { var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); //构造一个含有目标参数的正则表达式对象 var r = window.location.search.substr(1).match(reg); //匹配目标参数 + if (r != null) return unescape(r[2]); - return null; //返回参数值 + window.location.href = "login" + // return null; //返回参数值 } } })