启动小改+openid返回

master
管理员 3 years ago
parent 4eec26a4ea
commit f643400df7

@ -1,8 +1,18 @@
package com.ruoyi;
import cn.hutool.core.net.NetUtil;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.framework.config.ApplicationConfig;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
import org.springframework.context.ApplicationContext;
import org.springframework.core.env.Environment;
import java.net.InetAddress;
import java.util.Arrays;
/**
*
@ -11,14 +21,41 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt
*/
@SpringBootApplication
@Slf4j
public class RuoYiApplication {
public static void main(String[] args) {
System.setProperty("spring.devtools.restart.enabled", "false");
public static void main(String[] args)throws Exception {
// System.setProperty("spring.devtools.restart.enabled", "false");
SpringApplication application = new SpringApplication(RuoYiApplication.class);
application.setApplicationStartup(new BufferingApplicationStartup(2048));
application.run(args);
System.out.println("(♥◠‿◠)ノ゙ RuoYi-Vue-Plus启动成功 ლ(´ڡ`ლ)゙");
ApplicationContext act =application.run(args);
RuoYiConfig config = act.getBean(RuoYiConfig.class);
Environment environment = act.getEnvironment();
// System.out.println("(♥◠‿◠)ノ゙ RuoYi-Vue-Plus启动成功 ლ(´ڡ`ლ)゙");
System.setProperty("https.protocols", "TLSv1,TLSv1.1,TLSv1.2");
StringBuffer sb = new StringBuffer("\n\n");
sb.append("┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n");
sb.append("┃ 项目名称:" + config.getName() + "\n");
sb.append("┃ 项目版本:" + config.getVersion() + "\n");
sb.append("┃ 运行环境:" + environment.getProperty("spring.profiles.active","main") + "\n");
sb.append("┃ 运行模式:" + (config.getDev() ? "开发模式" : "生产模式") + "\n");
String port = ":"+environment.getProperty("server.port","8080");
if(":80".equals(port)){
port="";
}
try {
// for(String s : NetUtil.localIps()) {
for(String s : NetUtil.localIpv4s()) {
sb.append("┃ 访问地址http://" + s + port + "\n");
};
} catch (Exception e) {
sb.append("┃ 访问地址http://127.0.0.1" + port + "\n");
}
sb.append("┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n");
sb.append("\n\n\n");
log.info(sb.toString());
}
}

@ -105,6 +105,13 @@ spring:
--- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
spring:
devtools:
restart:
# 热部署开关
# 关闭热部署(修改编译后自动重启)
# 第二选择:热加载,修改编译后的class自动重新加载(不重启),注解不会生效哦
# 第二选择需要加vm参数 -javaagent:[路径]\springloaded-1.2.8.RELEASE.jar -noverify
enabled: false
redis:
# 地址
host: 10.0.0.201

@ -17,14 +17,14 @@ ruoyi:
# 小程序的用户默认设置
default-user:
# 所在单位
dept-id: 101
dept-id: 1663084919613812737
# 用户类型
user-type: app_user
# 帐号状态0正常 1停用
status: 0
# 用户组
role-ids:
- 2
- 1663086455907676162
# 岗位组
post-ids:
- 4
@ -108,7 +108,7 @@ spring:
devtools:
restart:
# 热部署开关
enabled: true
enabled: false
mvc:
format:
date-time: yyyy-MM-dd HH:mm:ss
@ -319,4 +319,4 @@ sms:
templates:
# 短信模板名: 短信模板内容:{数据map的key}
code: 您的验证码是:{1}
xxx: {key1},{key2}
xxx: 短信模板内容:{key1},{key2}

@ -7,6 +7,7 @@
<resultMap type="SysUser" id="SysUserResult">
<id property="userId" column="user_id"/>
<result property="deptId" column="dept_id"/>
<result property="openid" column="openid"/>
<result property="userName" column="user_name"/>
<result property="nickName" column="nick_name"/>
<result property="userType" column="user_type"/>
@ -50,6 +51,7 @@
<sql id="selectUserVo">
select u.user_id,
u.dept_id,
u.openid,
u.user_name,
u.nick_name,
u.user_type,
@ -85,7 +87,7 @@
</sql>
<select id="selectPageUserList" resultMap="SysUserResult">
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
select u.user_id, u.dept_id,u.openid, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex,
u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader
from sys_user u
left join sys_dept d on u.dept_id = d.dept_id

Loading…
Cancel
Save