huanghai
/
dsProject
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

'commit'

Browse Source
main
HuangHai 3 months ago
parent 1389fcbfac
commit b393f6f4ba
6 changed files with 110 additions and 24 deletions
Show Stats Download Patch File Download Diff File

28
dsBase/pom.xml
Unescape View File

@ -3,9 +3,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>dsideal</groupId>
<parent>
<groupId>com.dsideal</groupId>
<artifactId>dsProject</artifactId>
<version>1.0</version>
</parent>
<artifactId>dsBase</artifactId>
<version>1.0</version>
<name>dsBase</name>
<!--使用jdk21进行编译-->
<properties>
<maven.compiler.source>21</maven.compiler.source>
@ -168,7 +172,20 @@
<artifactId>jedis</artifactId>
<version>5.2.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>${snakeyaml.version}</version>
</dependency>
<!--https://blog.csdn.net/AdminGuan/article/details/100147488-->
<!--JWT,用于鉴权-->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>0.7.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
@ -197,7 +214,12 @@
</exclusion>
</exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/org.yaml/snakeyaml -->
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>${snakeyaml.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
<dependency>
<groupId>org.projectlombok</groupId>

29
dsBase/src/main/java/com/dsideal/dsBase/BaseApplication.java
Unescape View File

@ -19,7 +19,8 @@ import com.dsideal.dsBase.TeacherYd.Controller.TeacherYdController;
import com.dsideal.dsBase.Util.LogBackLogFactory;
import com.dsideal.dsBase.Util.PkUtil;
import com.jfinal.config.*;
import com.jfinal.kit.PropKit;
import com.jfinal.kit.Prop;
import com.dsideal.dsBase.Plugin.YamlProp;
import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
import com.jfinal.plugin.activerecord.dialect.PostgreSqlDialect;
import com.jfinal.plugin.hikaricp.HikariCpPlugin;
@ -32,9 +33,31 @@ import java.io.File;
import java.util.Objects;
public class BaseApplication extends JFinalConfig {
/**
* 功能：获取是否为开发环境
*
* @return
*/
public static String getEnvPrefix() {
String myEnvVar = System.getenv("WORKING_ENV");
if (myEnvVar == null) {
myEnvVar = "dev";
}
return myEnvVar;
}
public static Prop PropKit;
static {
//加载配置文件
String configFile = "application_{?}.yaml".replace("{?}", getEnvPrefix());
PropKit = new YamlProp(configFile);
}
public static void main(String[] args) {
PropKit.use("application.properties");
UndertowServer.create(BaseApplication.class, "undertow.properties").start();
System.out.println("当前环境: " + getEnvPrefix());
String configFile = "undertow.properties";
UndertowServer.create(BaseApplication.class, configFile).start();
}
/**

1
dsBase/src/main/java/com/dsideal/dsBase/LoginPerson/Controller/LoginPersonController.java
Unescape View File

@ -260,6 +260,7 @@ public class LoginPersonController extends Controller {
resultJson.put("bureau_id", loginMap.get("bureau_id").toString());
resultJson.put("person_name", loginMap.get("person_name").toString());
resultJson.put("org_code", loginMap.get("org_code").toString());
//添加返回的JWT
String jwtToken = JwtUtil.generateToken(Integer.parseInt(loginMap.get("identity_id").toString()),
loginMap.get("person_id").toString(), loginMap.get("bureau_id").toString());

47
dsBase/src/main/java/com/dsideal/dsBase/Plugin/YamlProp.java
Unescape View File

@ -0,0 +1,47 @@
package com.dsideal.dsBase.Plugin;
import com.jfinal.kit.Prop;
import org.yaml.snakeyaml.Yaml;
import java.io.InputStream;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Properties;
public class YamlProp extends Prop {
public YamlProp(String yamlFile) {
setYaml(yamlFile);
}
private void setYaml(String yamlFile) {
LinkedHashMap map = null;
Properties properties = new Properties();
InputStream in;
try {
Yaml yaml = new Yaml();
in = YamlProp.class.getClassLoader().getResourceAsStream(yamlFile);
map = yaml.loadAs(in, LinkedHashMap.class);
} catch (Exception e) {
e.printStackTrace();
}
setProperties(properties, map, "");
this.properties = properties;
}
private static void setProperties(Properties properties, Map map, String prefix) {
for (Object key : map.keySet()) {
Object value = map.get(key);
if (key == null) {
continue;
}
if (value instanceof Map) {
setProperties(properties, (Map) value, prefix + key + ".");
} else {
if (value == null) {
continue;
}
properties.setProperty(prefix + key, value.toString());
}
}
}
}

1
dsGw/src/main/java/com/dsideal/gw/GwApplication.java
Unescape View File

@ -7,7 +7,6 @@ import com.dsideal.gw.Util.CommonUtil;
import com.dsideal.gw.Util.LogBackLogFactory;
import com.jfinal.config.*;
import com.jfinal.kit.Prop;
import com.jfinal.kit.PropKit;
import com.jfinal.plugin.redis.RedisPlugin;
import com.jfinal.server.undertow.UndertowServer;
import com.jfinal.template.Engine;

28
dsUtils/pom.xml
Unescape View File

@ -49,7 +49,6 @@
<version>${mysql.version}</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
<!--安装hutool-->
<dependency>
<groupId>cn.hutool</groupId>
@ -97,30 +96,31 @@
<version>2.1.4</version>
</dependency>
<!-- 日志相关依赖 -->
<!-- SLF4J API -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.5.14</version>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.9</version>
</dependency>
<!-- Log4j2 实现 -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<artifactId>log4j-slf4j2-impl</artifactId>
<version>2.20.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<artifactId>log4j-core</artifactId>
<version>2.20.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.7.36</version>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.20.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
<dependency>
@ -140,12 +140,6 @@
<artifactId>jsch</artifactId>
<version>0.2.19</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.5.8</version>
<scope>runtime</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.freemarker/freemarker -->
<dependency>
<groupId>org.freemarker</groupId>

Write Preview
Loading…
Cancel
Save