Skip to content

Administrator / framework-tools

Go to a project
Commit b467e0e0 by henry
Options

修改配置文件

1 parent 74cc3198
Expand all
Inline Side-by-side
Showing with 41 additions and 88 deletions
arch-clouds/log/src/main/java/org/arch/log/filter/LoginFilter.java
...@@ -25,56 +25,7 @@ public class LoginFilter implements Filter ...@@ -25,56 +25,7 @@ public class LoginFilter implements Filter
@Override @Override
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException
{ {
JwtUitls jwtUitls = new JwtUitls();
Map<String, String> map = new HashMap<>();
String url = ((HttpServletRequest) servletRequest).getRequestURI();
if (url != null)
{
//登录请求直接放行
if ("/login".equals(url) || "/register".equals(url) ||"/i6000/adToKen".equals(url)|| "/i6000/adUserLoginLog".equals(url) )
{
filterChain.doFilter(servletRequest, servletResponse);
return;
} else
{
//其他请求验证token
String token = ((HttpServletRequest) servletRequest).getHeader("Authorization");
if (StringUtils.isNotBlank(token))
{
//token验证结果
int verify = jwtUitls.verify(token);
if (verify != 1)
{
//验证失败
if (verify == 2)
{
map.put("errorMsg", "token已过期");
} else if (verify == 0)
{
map.put("errorMsg", "用户信息验证失败");
}
} else if (verify == 1)
{
//验证成功，放行
filterChain.doFilter(servletRequest, servletResponse);
return;
}
} else
{
//token为空的返回
map.put("errorMsg", "未携带token信息");
}
}
JSONObject jsonObject = new JSONObject(map);
servletResponse.setContentType("application/json");
//设置响应的编码
servletResponse.setCharacterEncoding("utf-8");
//响应
PrintWriter pw = servletResponse.getWriter();
pw.write(jsonObject.toString());
pw.flush();
pw.close();
}
} }
@Override @Override
......
arch-overall/src/main/java/org/arch/modules/ArchOverallApp.java → arch-overall/src/main/java/org/arch/ArchOverallApp.java
package org.arch.modules; package org.arch;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
......
arch-overall/src/main/java/org/arch/modules/design/controller/ArchiElementController.java → arch-overall/src/main/java/org/arch/controller/ArchiElementController.java
package org.arch.modules.design.controller; package org.arch.controller;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -10,12 +10,9 @@ import org.arch.log.logenum.LogOperTypeEnum; ...@@ -10,12 +10,9 @@ import org.arch.log.logenum.LogOperTypeEnum;
import org.arch.log.logenum.LogTypeEnum; import org.arch.log.logenum.LogTypeEnum;
import org.arch.modules.archoverall.dto.ArchiElementDTO; import org.arch.modules.archoverall.dto.ArchiElementDTO;
import org.arch.modules.archoverall.dto.BatchUpdateDTO; import org.arch.modules.archoverall.dto.BatchUpdateDTO;
import org.arch.modules.design.entity.ArchiElement; import org.arch.entity.ArchiElement;
import org.arch.modules.design.service.ArchiElementService; import org.arch.service.ArchiElementService;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@Api(tags = {"元素管理"}) @Api(tags = {"元素管理"})
@RestController @RestController
...@@ -73,4 +70,8 @@ public class ArchiElementController { ...@@ -73,4 +70,8 @@ public class ArchiElementController {
public Result getEleList(@RequestBody ArchiElementDTO dto) { public Result getEleList(@RequestBody ArchiElementDTO dto) {
return Result.success(archiElementService.gtEleList(dto)); return Result.success(archiElementService.gtEleList(dto));
} }
@GetMapping("/getName")
public String getName(){
return "张三";
}
} }
arch-overall/src/main/java/org/arch/modules/design/entity/ArchiEleProperty.java → arch-overall/src/main/java/org/arch/entity/ArchiEleProperty.java
package org.arch.modules.design.entity; package org.arch.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
......
arch-overall/src/main/java/org/arch/modules/design/entity/ArchiElement.java → arch-overall/src/main/java/org/arch/entity/ArchiElement.java
package org.arch.modules.design.entity; package org.arch.entity;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
......
arch-overall/src/main/java/org/arch/modules/design/mapper/ArchiElePropertyMapper.java → arch-overall/src/main/java/org/arch/mapper/ArchiElePropertyMapper.java
package org.arch.modules.design.mapper; package org.arch.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.arch.modules.design.entity.ArchiEleProperty; import org.arch.entity.ArchiEleProperty;
public interface ArchiElePropertyMapper extends BaseMapper<ArchiEleProperty> { public interface ArchiElePropertyMapper extends BaseMapper<ArchiEleProperty> {
......
arch-overall/src/main/java/org/arch/modules/design/mapper/ArchiElementMapper.java → arch-overall/src/main/java/org/arch/mapper/ArchiElementMapper.java
package org.arch.modules.design.mapper; package org.arch.mapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.base.MPJBaseMapper; import com.github.yulichang.base.MPJBaseMapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.arch.modules.archoverall.dto.ArchiElementDTO; import org.arch.modules.archoverall.dto.ArchiElementDTO;
import org.arch.modules.design.entity.ArchiElement; import org.arch.entity.ArchiElement;
import java.util.List; import java.util.List;
public interface ArchiElementMapper extends MPJBaseMapper<ArchiElement> { public interface ArchiElementMapper extends MPJBaseMapper<ArchiElement> {
......
arch-overall/src/main/java/org/arch/modules/design/mapper/VersionInitMapper.java → arch-overall/src/main/java/org/arch/mapper/VersionInitMapper.java
package org.arch.modules.design.mapper; package org.arch.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
......
arch-overall/src/main/java/org/arch/modules/design/service/ArchiElementService.java → arch-overall/src/main/java/org/arch/service/ArchiElementService.java
package org.arch.modules.design.service; package org.arch.service;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import org.arch.modules.archoverall.dto.ArchiElementDTO; import org.arch.modules.archoverall.dto.ArchiElementDTO;
import org.arch.modules.archoverall.dto.BatchUpdateDTO; import org.arch.modules.archoverall.dto.BatchUpdateDTO;
import org.arch.modules.design.entity.ArchiEleProperty; import org.arch.entity.ArchiEleProperty;
import org.arch.modules.design.entity.ArchiElement; import org.arch.entity.ArchiElement;
import java.util.List; import java.util.List;
......
arch-overall/src/main/java/org/arch/modules/design/service/impl/ArchiElementImpl.java → arch-overall/src/main/java/org/arch/service/impl/ArchiElementImpl.java
package org.arch.modules.design.service.impl; package org.arch.service.impl;
import cn.hutool.core.lang.UUID; import cn.hutool.core.lang.UUID;
...@@ -10,13 +10,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; ...@@ -10,13 +10,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.xiaoymin.knife4j.core.util.StrUtil; import com.github.xiaoymin.knife4j.core.util.StrUtil;
import org.arch.entity.ArchiEleProperty;
import org.arch.entity.ArchiElement;
import org.arch.mapper.ArchiElePropertyMapper;
import org.arch.mapper.ArchiElementMapper;
import org.arch.modules.archoverall.dto.ArchiElementDTO; import org.arch.modules.archoverall.dto.ArchiElementDTO;
import org.arch.modules.archoverall.dto.BatchUpdateDTO; import org.arch.modules.archoverall.dto.BatchUpdateDTO;
import org.arch.modules.design.mapper.ArchiElePropertyMapper; import org.arch.service.ArchiElementService;
import org.arch.modules.design.entity.ArchiEleProperty;
import org.arch.modules.design.entity.ArchiElement;
import org.arch.modules.design.service.ArchiElementService;
import org.arch.modules.design.mapper.ArchiElementMapper;
import org.arch.utils.VersionUtil; import org.arch.utils.VersionUtil;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
......
arch-overall/src/main/resources/mapper/ArchiElementMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.arch.modules.design.mapper.ArchiElementMapper"> <mapper namespace="org.arch.mapper.ArchiElementMapper">
<resultMap id="BaseResultMap" type="org.arch.modules.design.entity.ArchiElement"> <resultMap id="BaseResultMap" type="org.arch.modules.entity.ArchiElement">
<result column="element_id" property="elementId"/> <result column="element_id" property="elementId"/>
<result column="element_code" property="elementCode"/> <result column="element_code" property="elementCode"/>
<result column="element_name" property="elementName"/> <result column="element_name" property="elementName"/>
...@@ -24,12 +24,12 @@ ...@@ -24,12 +24,12 @@
<result column="archi_belong_code" property="archiBelongCode"/> <result column="archi_belong_code" property="archiBelongCode"/>
</resultMap> </resultMap>
<select id="initVersion" resultType="org.arch.modules.design.entity.ArchiElement"> <select id="initVersion" resultType="org.arch.entity.ArchiElement">
SELECT CONCAT(DATE_FORMAT(NOW(), '%Y%m%d'), '-V', YEAR(NOW()) - 2023 - 1, '.', DATE_FORMAT(NOW(), '%m'), '.0') AS version; SELECT CONCAT(DATE_FORMAT(NOW(), '%Y%m%d'), '-V', YEAR(NOW()) - 2023 - 1, '.', DATE_FORMAT(NOW(), '%m'), '.0') AS version;
</select> </select>
<!--元素列表--> <!--元素列表-->
<select id="gtArchiElement" resultType="org.arch.modules.design.entity.ArchiElement"> <select id="gtArchiElement" resultType="org.arch.entity.ArchiElement">
select se.*, select se.*,
gm.graph_name as iconName, gm.graph_name as iconName,
gm.icon gm.icon
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</select> </select>
<!--根据元素名称查询元素--> <!--根据元素名称查询元素-->
<select id="gtArcEleByName" resultType="org.arch.modules.design.entity.ArchiElement"> <select id="gtArcEleByName" resultType="org.arch.entity.ArchiElement">
select se.element_id, select se.element_id,
se.element_name, se.element_name,
se.archi_belong_id, se.archi_belong_id,
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
order by se.create_time desc order by se.create_time desc
</select> </select>
<select id="gtEleList" resultType="org.arch.modules.design.entity.ArchiElement"> <select id="gtEleList" resultType="org.arch.entity.ArchiElement">
select se.*, select se.*,
gm.graph_name as iconName, gm.graph_name as iconName,
gm.icon gm.icon
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
order by se.create_time desc order by se.create_time desc
</select> </select>
<select id="maxVer" resultType="org.arch.modules.design.entity.ArchiElement"> <select id="maxVer" resultType="org.arch.entity.ArchiElement">
SELECT a.version SELECT a.version
FROM archi_element a FROM archi_element a
<where> <where>
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
<!--获取最新版本--> <!--获取最新版本-->
<select id="getVersion" resultType="java.lang.String"> <select id="getVersion" resultType="java.lang.String">
set @i := (<include refid="org.arch.modules.design.mapper.VersionInitMapper.versionInit"/>); set @i := (<include refid="org.arch.mapper.VersionInitMapper.versionInit"/>);
select ifnull(version, @i) from archi_element where element_id = #{elementId} for update select ifnull(version, @i) from archi_element where element_id = #{elementId} for update
</select> </select>
</mapper> </mapper>
\ No newline at end of file
arch-overall/src/main/resources/mapper/VersionInitMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.arch.modules.design.mapper.VersionInitMapper"> <mapper namespace="org.arch.mapper.VersionInitMapper">
<sql id="versionInit"> <sql id="versionInit">
SELECT CONCAT(DATE_FORMAT(NOW(), '%Y%m%d'), '-V', YEAR(NOW()) - 2023, '.', DATE_FORMAT(NOW(), '%m'), '.0') AS version SELECT CONCAT(DATE_FORMAT(NOW(), '%Y%m%d'), '-V', YEAR(NOW()) - 2023, '.', DATE_FORMAT(NOW(), '%m'), '.0') AS version
</sql> </sql>
......
logs/eadc-architecture_error.2024-07-01.log
...@@ -455,10 +455,10 @@ APPLICATION FAILED TO START ...@@ -455,10 +455,10 @@ APPLICATION FAILED TO START
Description: Description:
Parameter 0 of constructor in org.arch.modules.design.controller.ArchiElementController required a bean of type 'org.arch.modules.design.mapper.ArchiElementMapper' that could not be found. Parameter 0 of constructor in org.arch.modules.controller.ArchiElementController required a bean of type 'org.arch.modules.mapper.ArchiElementMapper' that could not be found.
Action: Action:
Consider defining a bean of type 'org.arch.modules.design.mapper.ArchiElementMapper' in your configuration. Consider defining a bean of type 'org.arch.modules.mapper.ArchiElementMapper' in your configuration.
logs/eadc-architecture_info.2024-07-01.0.log
...@@ -817,7 +817,7 @@ log: ...@@ -817,7 +817,7 @@ log:
2024-07-01 19:21:41.290 [main] INFO o.s.boot.web.servlet.RegistrationBean:50 - Filter xssFilter was not registered (disabled) 2024-07-01 19:21:41.290 [main] INFO o.s.boot.web.servlet.RegistrationBean:50 - Filter xssFilter was not registered (disabled)
2024-07-01 19:21:41.291 [main] INFO o.s.boot.web.servlet.RegistrationBean:50 - Filter sqlFilter was not registered (disabled) 2024-07-01 19:21:41.291 [main] INFO o.s.boot.web.servlet.RegistrationBean:50 - Filter sqlFilter was not registered (disabled)
2024-07-01 19:21:41.291 [main] INFO o.s.boot.web.servlet.RegistrationBean:50 - Filter loginFilter was not registered (disabled) 2024-07-01 19:21:41.291 [main] INFO o.s.boot.web.servlet.RegistrationBean:50 - Filter loginFilter was not registered (disabled)
2024-07-01 19:21:41.362 [main] WARN o.s.b.w.s.c.AnnotationConfigServletWebServerApplicationContext:591 - Exception encountered during context initialization - cancelling refresh attempt: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'archiElementController' defined in file [E:\gw_space\arch-toos\arch-overall\target\classes\org\arch\modules\design\controller\ArchiElementController.class]: Unsatisfied dependency expressed through constructor parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'archiElementImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.NoSuchBeanDefinitionException: No qualifying bean of type 'org.arch.modules.design.mapper.ArchiElementMapper' available: expected at least 1 bean which qualifies as autowire candidate. Dependency annotations: {@javax.annotation.Resource(shareable=true, lookup=, name=, description=, authenticationType=CONTAINER, type=class java.lang.Object, mappedName=)} 2024-07-01 19:21:41.362 [main] WARN o.s.b.w.s.c.AnnotationConfigServletWebServerApplicationContext:591 - Exception encountered during context initialization - cancelling refresh attempt: org.springframework.beans.factory.UnsatisfiedDependencyException: Error creating bean with name 'archiElementController' defined in file [E:\gw_space\arch-toos\arch-overall\target\classes\org\arch\modules\design\controller\ArchiElementController.class]: Unsatisfied dependency expressed through constructor parameter 0; nested exception is org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'archiElementImpl': Injection of resource dependencies failed; nested exception is org.springframework.beans.factory.NoSuchBeanDefinitionException: No qualifying bean of type 'org.arch.modules.mapper.ArchiElementMapper' available: expected at least 1 bean which qualifies as autowire candidate. Dependency annotations: {@javax.annotation.Resource(shareable=true, lookup=, name=, description=, authenticationType=CONTAINER, type=class java.lang.Object, mappedName=)}
2024-07-01 19:21:41.364 [main] INFO org.apache.catalina.core.StandardService:173 - Stopping service [Tomcat] 2024-07-01 19:21:41.364 [main] INFO org.apache.catalina.core.StandardService:173 - Stopping service [Tomcat]
2024-07-01 19:21:41.369 [main] ERROR o.a.c.core.ContainerBase.[Tomcat].[localhost].[/]:175 - Failed to destroy the filter named [Tomcat WebSocket (JSR356) Filter] of type [org.apache.tomcat.websocket.server.WsFilter] 2024-07-01 19:21:41.369 [main] ERROR o.a.c.core.ContainerBase.[Tomcat].[localhost].[/]:175 - Failed to destroy the filter named [Tomcat WebSocket (JSR356) Filter] of type [org.apache.tomcat.websocket.server.WsFilter]
java.lang.AbstractMethodError: null java.lang.AbstractMethodError: null
...@@ -864,10 +864,10 @@ APPLICATION FAILED TO START ...@@ -864,10 +864,10 @@ APPLICATION FAILED TO START
Description: Description:
Parameter 0 of constructor in org.arch.modules.design.controller.ArchiElementController required a bean of type 'org.arch.modules.design.mapper.ArchiElementMapper' that could not be found. Parameter 0 of constructor in org.arch.modules.controller.ArchiElementController required a bean of type 'org.arch.modules.mapper.ArchiElementMapper' that could not be found.
Action: Action:
Consider defining a bean of type 'org.arch.modules.design.mapper.ArchiElementMapper' in your configuration. Consider defining a bean of type 'org.arch.modules.mapper.ArchiElementMapper' in your configuration.
logs/eadc-architecture_info.log
This diff could not be displayed because it is too large.
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!