gfwleak/k18-ntcs-web-argus-service
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(sql):修复业务字典的命名

Browse Source
This commit is contained in:
doufenghu
2018-11-07 10:11:04 +08:00
parent 37aebe559e
commit 673fb33ba5
4 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
db/init/galaxy_data_mysql.sql
View File

File diff suppressed because one or more lines are too long

7
pom.xml
View File

@@ -32,9 +32,6 @@
<build>
<resources>
@@ -639,9 +636,9 @@
<sql driver="${jdbc.deploy.driver}" url="${jdbc.deploy.url}" userid="${jdbc.deploy.username}" password="${jdbc.deploy.password}"
onerror="continue" encoding="${maven.compiler.encoding}">
<classpath refid="maven.test.classpath" />
<!--<transaction src="db/init/galaxy_stru_${jdbc.type}.sql"/>
<transaction src="db/init/galaxy_stru_${jdbc.type}.sql"/>
<transaction src="db/init/galaxy_stru_ui_${jdbc.type}.sql"/>
<transaction src="db/init/galaxy_data_${jdbc.type}.sql"/>-->
<transaction src="db/init/galaxy_data_${jdbc.type}.sql"/>
<transaction src="db/test/galaxy_test_${jdbc.type}.sql"/>
</sql>

24
src/main/java/com/nis/listener/CompileGroupRegionRela.java
View File

@@ -1,24 +1,18 @@
package com.nis.listener;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import javax.servlet.ServletContextEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.context.ContextLoaderListener;
import com.nis.domain.restful.CompileAndGroupRelations;
import com.nis.domain.restful.GroupAndRegionRelations;
import com.nis.domain.restful.MaatRelation;
import com.nis.util.Configurations;
import com.nis.web.service.SpringContextHolder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.context.ContextLoaderListener;
import javax.servlet.ServletContextEvent;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
/**
* 项目启动时加载数据字典
@@ -46,6 +40,8 @@ public class CompileGroupRegionRela extends ContextLoaderListener {
} catch (Exception e) {
e.printStackTrace();
}
}
private void getAllId(RedisTemplate<String, String> redisTemplate, int redisDBIndex) {

13
src/main/resources/rebel.xml
View File

@@ -1,16 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://www.zeroturnaround.com/alderaan/rebel-2_0.xsd">
<!--
This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
Refer to https://manuals.zeroturnaround.com/jrebel/standalone/config.html for more information.
-->
<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_1.xsd">
<classpath>
<dir name="D:/workspace/springmvc4_frame/target/classes">
</dir>
<dir name="D:/workspace/springmvc4_frame/target/test-classes">
<dir name="D:/galaxy-service/target/classes">
</dir>
</classpath>
<web>
<link target="/">
<dir name="D:/workspace/springmvc4_frame/src/main/webapp">
<dir name="D:/galaxy-service/src/main/webapp">
</dir>
</link>
</web>