修改包名为ozs

dc-account/src/main/java/com/ozs/account/controller/KaptchaController.java

@@ -83,6 +83,7 @@ public class KaptchaController {
         @ApiImplicitParam(paramType = "query", name = "authCode", value = "验证码", required = true, dataType = "String") })
     @GetMapping(value = "/account/ifAuthCodeCorrect")
     public R<Object> ifAuthCodeCorrect(@RequestParam(value = "authId") String authId,@RequestParam("authCode") String authCode){
+//        return new R<>(S.OK, S.getMsg(S.OK), true);
         boolean result = false;
         try {
             //得到redis中的验证码

dc-account/src/main/resources/application.yml

@@ -14,8 +14,9 @@ datasource:
     username: admin
     password: 106aD>>ql95K5S
 redis:
-    host: 10.199.10.10
-    port: 16370
+    host: 127.0.0.1
+    port: 7001
+    password: 106@qwe123
     
 ###############常用配置项###############
 spring:
@@ -52,7 +53,7 @@ spring:
         database: 0                      # Redis数据库索引（默认为0）
         host: ${redis.host}              # Redis服务器地址
         port: ${redis.port}              # Redis服务器连接端口
-        password:                        # Redis服务器连接密码（默认为空）
+        password: ${redis.password}                     # Redis服务器连接密码（默认为空）
         timeout: 20000                   # 连接超时时间（毫秒）
         pool: 
             max-active: -1               # 连接池最大连接数（使用负值表示没有限制）

dc-mdm/src/main/java/com/ozs/mdm/config/SwaggerConfig.java

@@ -24,7 +24,7 @@ public class SwaggerConfig {
 	public Docket api() {
 		return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()).select()
 				// .apis(RequestHandlerSelectors.withClassAnnotation(RestController.class))
-				.apis(RequestHandlerSelectors.basePackage("com.datau.mdm.controller")).paths(PathSelectors.any())
+				.apis(RequestHandlerSelectors.basePackage("com.ozs.mdm.controller")).paths(PathSelectors.any())
 				.build().pathMapping("/").globalOperationParameters(setHeaderToken());
 	}
 

kpim/pom.xml

@@ -156,6 +156,7 @@
 		</dependencies>
 	</dependencyManagement>
 
+
 	<build>
 		<plugins>
 			<plugin>

kpim/src/main/java/com/ozs/kpim/config/SwaggerConfig.java

@@ -27,7 +27,7 @@ public class SwaggerConfig {
 	public Docket api() {
 		return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()).select()
 				//.apis(RequestHandlerSelectors.withClassAnnotation(RestController.class))
-						.apis(RequestHandlerSelectors.basePackage("com.datau.kpim.controller"))
+						.apis(RequestHandlerSelectors.basePackage("com.ozs.kpim.controller"))
 						.paths(PathSelectors.any())
 				.build().pathMapping("/").globalOperationParameters(setHeaderToken());
 	}

kpim/src/main/resources/mybatis/CommonMapper.xml

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper
   PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.datau.kpim.mapper.common.CommonMapper">
+<mapper namespace="com.ozs.kpim.mapper.common.CommonMapper">
 
 	<!--配置类型列表查询-->
-	<select id="listTypes" resultType="com.datau.kpim.dto.common.TypeDTO">
+	<select id="listTypes" resultType="com.ozs.kpim.dto.common.TypeDTO">
 	    SELECT  id,name FROM  kpim_dim_type
 	</select>
 
 	<!--符号列表查询-->
-	<select id="listSigns" resultType="com.datau.kpim.dto.common.SignDTO">
+	<select id="listSigns" resultType="com.ozs.kpim.dto.common.SignDTO">
 	    SELECT  id,sign FROM  kpim_dim_sign
 	</select>
 
 	<!--规则类型查询-->
-	<select id="listRuleTypes" resultType="com.datau.kpim.dto.common.RuleTypeDTO">
+	<select id="listRuleTypes" resultType="com.ozs.kpim.dto.common.RuleTypeDTO">
 		SELECT
 			id,type,format,type_desc
 		FROM  kpim_dim_rule_type
@@ -22,7 +22,7 @@
 	</select>
 
 	<!--查询普通管理员列表-->
-	<select id="listAdministrativeUsers" resultType="com.datau.kpim.dto.common.UserDTO">
+	<select id="listAdministrativeUsers" resultType="com.ozs.kpim.dto.common.UserDTO">
 		SELECT id,username,nickname,user_type FROM dc_info_user
 		WHERE user_type = #{userType}
 	</select>

kpim/src/main/resources/mybatis/KpiConfigMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper
   PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.datau.kpim.mapper.kpiconfig.KpiConfigMapper">
+<mapper namespace="com.ozs.kpim.mapper.kpiconfig.KpiConfigMapper">
 
 	<sql id="base_column_list">
 		id,name,type,rule_type_id,rule,kpi_code,unit,description,enable_status,edit_status,
@@ -9,7 +9,7 @@
 	</sql>
 
 	<!--插入一条(所有字段) -->
-	<insert id="insert" parameterType="com.datau.kpim.dto.kpiconfig.KpiConfigPO">
+	<insert id="insert" parameterType="com.ozs.kpim.dto.kpiconfig.KpiConfigPO">
 		INSERT INTO kpim_info_config(
 		id,name,type,rule_type_id,rule,kpi_code,unit,description,enable_status,
 		edit_status,update_time,update_user_id,relationship
@@ -19,7 +19,7 @@
 	</insert>
 
 	<!--更新（所有字段,id,kpi_code除外） -->
-	<update id="update" parameterType="com.datau.kpim.dto.kpiconfig.KpiConfigPO">
+	<update id="update" parameterType="com.ozs.kpim.dto.kpiconfig.KpiConfigPO">
 		UPDATE kpim_info_config
 		SET
 		name = #{name},
@@ -56,7 +56,7 @@
 	</select>
 
 	<!--根据ID查询详情 -->
-	<select id="getById" resultType="com.datau.kpim.dto.kpiconfig.KpiConfigPO">
+	<select id="getById" resultType="com.ozs.kpim.dto.kpiconfig.KpiConfigPO">
 		SELECT
 		A.id,A.name,A.type,A.rule_type_id,A.rule,A.kpi_code,
 		A.unit,A.description,A.enable_status,A.edit_status,
@@ -91,7 +91,7 @@
 	</select>
 
 	<!--KPI列表查询 -->
-	<select id="listKpiConfigs" resultType="com.datau.kpim.dto.kpiconfig.KpiConfigForListDTO">
+	<select id="listKpiConfigs" resultType="com.ozs.kpim.dto.kpiconfig.KpiConfigForListDTO">
 
 		SELECT
 		DISTINCT(A.id),A.name,A.type,A.rule_type_id,A.rule,A.kpi_code,
@@ -166,7 +166,7 @@
 	</select>
 
 	<!--查询主题下的KPI配置信息 -->
-	<select id="listKpiConfigsByTopic" resultType="com.datau.kpim.dto.kpiconfig.KpiConfigForListDTO">
+	<select id="listKpiConfigsByTopic" resultType="com.ozs.kpim.dto.kpiconfig.KpiConfigForListDTO">
 		SELECT
 		C.id,C.kpi_code,C.name,C.type,C.rule_type_id,
 		D.name as typeName,E.type_desc as ruleTypeName,E.type as ruleType,E.format

kpim/src/main/resources/mybatis/KpiFunctionMapper.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper
   PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.datau.kpim.mapper.common.KpiFunctionMapper">
-	<select id="listKpiFunction" resultType="com.datau.kpim.dto.common.KpiFunctionDTO">
+<mapper namespace="com.ozs.kpim.mapper.common.KpiFunctionMapper">
+	<select id="listKpiFunction" resultType="com.ozs.kpim.dto.common.KpiFunctionDTO">
 		select
 		id,function_name,function_desc,function_value,column_num
 		from
 		kpim_info_function
 	</select>
-	<select id="listKpiFunctionPage" resultType="com.datau.kpim.dto.common.KpiFunctionDTO">
+	<select id="listKpiFunctionPage" resultType="com.ozs.kpim.dto.common.KpiFunctionDTO">
 		select
 		id,function_name,function_desc,function_value,column_num
 		from
@@ -17,7 +17,7 @@
 			AND function_name LIKE CONCAT('%',#{functionName},'%')
 		</if>
 	</select>
-	<select id="getKpiFunction" resultType="com.datau.kpim.dto.common.KpiFunctionDTO">
+	<select id="getKpiFunction" resultType="com.ozs.kpim.dto.common.KpiFunctionDTO">
 		select
 		id,function_name,function_desc,function_value,column_num
 		from

kpim/src/main/resources/mybatis/KpiRelationMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.datau.kpim.mapper.kpiconfig.KpiRelationMapper">
+<mapper namespace="com.ozs.kpim.mapper.kpiconfig.KpiRelationMapper">
 
 	<!--批量插入数据到kpim_rel_kpi_topic表 -->
 	<insert id="insertKpiRelTopicBatch" parameterType="java.util.List">

kpim/src/main/resources/mybatis/TopicMapper.xml

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper
   PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.datau.kpim.mapper.topic.TopicMapper">
+<mapper namespace="com.ozs.kpim.mapper.topic.TopicMapper">
 
 	<sql id="base_column_list">
 		id,topic_code,name,description,level,update_time,update_user_id,create_time
 	</sql>
 
 	<!--插入(所有字段)-->
-	<insert id="insert" parameterType="com.datau.kpim.dto.topic.TopicDTO">
+	<insert id="insert" parameterType="com.ozs.kpim.dto.topic.TopicDTO">
 		INSERT INTO kpim_info_topic(id,topic_code,name,description,level,update_time,update_user_id,create_time)
 		VALUE(UUID(),#{topicCode},#{name},#{description},#{level},NOW(),#{updateUserId},NOW());
 	</insert>
 
 	<!--更新（所有字段,id,topic_code，level除外）-->
-	<update id="update" parameterType="com.datau.kpim.dto.topic.TopicDTO">
+	<update id="update" parameterType="com.ozs.kpim.dto.topic.TopicDTO">
 		UPDATE kpim_info_topic
 		SET
 			name = #{name},
@@ -41,7 +41,7 @@
 	</delete>
 
 	<!--根据ID查询详情-->
-	<select id="getById" resultType="com.datau.kpim.dto.topic.TopicDTO">
+	<select id="getById" resultType="com.ozs.kpim.dto.topic.TopicDTO">
 		SELECT
 			A.id,A.topic_code,
 			A.name,A.description,
@@ -61,7 +61,7 @@
 	</select>
 
 	<!--根据topic_code查询详情-->
-	<select id="getByTopicCode" resultType="com.datau.kpim.dto.topic.TopicDTO">
+	<select id="getByTopicCode" resultType="com.ozs.kpim.dto.topic.TopicDTO">
 		SELECT
 			A.id,A.topic_code,
 			A.name,A.description,
@@ -80,7 +80,7 @@
 	</select>
 
 	<!--根据topic_code查询主题列表-->
-	<select id="listTopicsByTopicCodes" resultType="com.datau.kpim.dto.topic.TopicDTO">
+	<select id="listTopicsByTopicCodes" resultType="com.ozs.kpim.dto.topic.TopicDTO">
 		SELECT
 			A.id,A.topic_code,
 			A.name,A.description,
@@ -106,7 +106,7 @@
 	</select>
 
 	<!--根据KpiId查询主题列表-->
-	<select id="listTopicsByKpiId" resultType="com.datau.kpim.dto.topic.TopicDTO">
+	<select id="listTopicsByKpiId" resultType="com.ozs.kpim.dto.topic.TopicDTO">
 		SELECT
 		A.id,A.topic_code,
 		A.name,A.description,
@@ -151,7 +151,7 @@
 	</select>
 
 	<!--主题列表查询-->
-	<select id="listTopics" resultType="com.datau.kpim.dto.topic.TopicDTO">
+	<select id="listTopics" resultType="com.ozs.kpim.dto.topic.TopicDTO">
 		SELECT
 			A.id,A.topic_code,
 			A.name,A.description,
@@ -174,7 +174,7 @@
 	</select>
 
 	<!--查询上级主题编码查询下级主题-->
-	<select id="listSubTopics" resultType="com.datau.kpim.dto.topic.TopicDTO">
+	<select id="listSubTopics" resultType="com.ozs.kpim.dto.topic.TopicDTO">
 		SELECT
 			<include refid="base_column_list"/>
 		FROM kpim_info_topic
@@ -191,7 +191,7 @@
 	</select>
 
 	<!--20190331查询主题的所有子主题不分级别-->
-	<select id="listAllSubTopics" resultType="com.datau.kpim.dto.topic.TopicDTO">
+	<select id="listAllSubTopics" resultType="com.ozs.kpim.dto.topic.TopicDTO">
 		SELECT
 		<include refid="base_column_list"/>
 		FROM kpim_info_topic
@@ -199,7 +199,7 @@
 	</select>
 
 	<!--给ztree使用的格式-->
-	<select id="topicForZtree" resultType="com.datau.kpim.dto.topic.TopicZtreeDTO">
+	<select id="topicForZtree" resultType="com.ozs.kpim.dto.topic.TopicZtreeDTO">
 		SELECT
             A.id,
 			A.topic_code as code,

rpm/.idea/jarRepositories.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="nexus" />
+      <option name="name" value="Nexus Repository" />
+      <option name="url" value="http://10.21.171.91:8084/nexus/content/groups/public/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="spring-milestones" />
       <option name="name" value="Spring Milestones" />