提交 1939411f 编写于 作者: ibizdev's avatar ibizdev

jackwang 部署微服务应用

上级 2561d2ce
......@@ -580,7 +580,7 @@
"memo": ""
},
"hrdutygridview": {
"title": "职务表格",
"title": "职务",
"caption": "职务",
"viewtype": "DEGRIDVIEW",
"viewmodule": "HumanResource",
......
......@@ -32,7 +32,7 @@ export default {
},
gridview: {
caption: "职务",
title: "职务表格",
title: "职务",
},
pickupgridview: {
caption: "职务",
......
......@@ -31,7 +31,7 @@ export default {
},
gridview: {
caption: "职务",
title: "职务表格",
title: "职务",
},
pickupgridview: {
caption: "职务",
......
......@@ -472,7 +472,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtag": "b90584e97a642bf5d5d8dac74217c6fc"
},
"hrdutygridview": {
"title": "职务表格",
"title": "职务",
"caption": "职务",
"viewtype": "DEGRIDVIEW",
"viewmodule": "HumanResource",
......
......@@ -9,7 +9,7 @@ import CodeListService from "@service/app/codelist-service";
/**
* 职务表格视图基类
* 职务视图基类
*
* @export
* @class HRDutyGridViewBase
......
<studio-view-style2 viewName="hrdutygridview" viewTitle="职务表格" class='degridview hrduty-grid-view'>
<studio-view-style2 viewName="hrdutygridview" viewTitle="职务" class='degridview hrduty-grid-view'>
<i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="职务名称" search @on-search="onSearch($event)"/>
<template slot="toolbar">
<view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/> </template>
......
......@@ -7,7 +7,7 @@ import view_grid from '@widgets/hrduty/main-grid/main-grid.vue';
import view_searchform from '@widgets/hrduty/default-searchform/default-searchform.vue';
/**
* 职务表格视图
* 职务视图
*
* @export
* @class HRDutyGridView
......
<studio-view-style2 viewName="hrdutytabexpview" viewTitle="职务信息" class='detabexpview hrduty-tab-exp-view'>
<template slot='title'>
<span class='caption-info'>{{$t(model.srfTitle)}}</span>
</template>
<template slot="toolbar">
<view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click.apply(_self, arguments)"/> </template>
<view_tabexppanel
......
......@@ -2,7 +2,7 @@ import { Store } from 'vuex';
import axios from 'axios';
import Router from 'vue-router';
import i18n from '@/locale';
import { Environment } from '@/environments/environment';
/**
* 拦截器
......@@ -96,9 +96,9 @@ export class Interceptors {
config.headers['Authorization'] = `Bearer ${token}`;
}
config.headers['Accept-Language'] = i18n.locale;
// if (!config.url.startsWith('https://') && !config.url.startsWith('http://')) {
// config.url = Environment.BaseUrl + config.url;
// }
if (!Object.is(Environment.BaseUrl,"") && !config.url.startsWith('https://') && !config.url.startsWith('http://') && !config.url.startsWith('./assets')) {
config.url = Environment.BaseUrl + config.url;
}
return config;
}, (error: any) => {
return Promise.reject(error);
......@@ -169,4 +169,4 @@ export class Interceptors {
}
}
}
\ No newline at end of file
}
......@@ -13,6 +13,8 @@ import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import cn.ibizlab.humanresource.util.web.SearchContextHandlerMethodArgumentResolver;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
@Slf4j
......@@ -30,6 +32,9 @@ import java.util.List;
})
public class PIMApplication extends WebMvcConfigurerAdapter{
@Autowired
SearchContextHandlerMethodArgumentResolver resolver;
public static void main(String[] args) {
SpringApplication.run(PIMApplication.class,args);
}
......@@ -37,6 +42,6 @@ public class PIMApplication extends WebMvcConfigurerAdapter{
@Override
public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
super.addArgumentResolvers(argumentResolvers);
argumentResolvers.add(new cn.ibizlab.humanresource.util.web.SearchContextHandlerMethodArgumentResolver());
argumentResolvers.add(resolver);
}
}
......@@ -14,6 +14,8 @@ import org.springframework.context.annotation.ComponentScan;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling;
import java.util.List;
import cn.ibizlab.humanresource.util.web.SearchContextHandlerMethodArgumentResolver;
import org.springframework.beans.factory.annotation.Autowired;
@Slf4j
@EnableDiscoveryClient
......@@ -34,6 +36,9 @@ import java.util.List;
@EnableScheduling
public class DevBootApplication extends WebMvcConfigurerAdapter{
@Autowired
SearchContextHandlerMethodArgumentResolver resolver;
public static void main(String[] args) {
SpringApplication.run(DevBootApplication.class,args);
}
......@@ -41,6 +46,6 @@ public class DevBootApplication extends WebMvcConfigurerAdapter{
@Override
public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
super.addArgumentResolvers(argumentResolvers);
argumentResolvers.add(new cn.ibizlab.humanresource.util.web.SearchContextHandlerMethodArgumentResolver());
argumentResolvers.add(resolver);
}
}
......@@ -52,7 +52,7 @@
<!--输出实体[HRDUTY]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-hrduty-63-3">
<changeSet author="a_LAB01_e85d8801c" id="tab-hrduty-66-3">
<createTable tableName="T_HRDUTY">
<column name="HRDUTYID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_HRDUTY_HRDUTYID"/>
......
......@@ -15,6 +15,8 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling;
import cn.ibizlab.humanresource.util.web.SearchContextHandlerMethodArgumentResolver;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
@Slf4j
......@@ -40,6 +42,9 @@ import java.util.List;
@EnableScheduling
public class iBizHumanResourcesHRApiApplication extends WebMvcConfigurerAdapter{
@Autowired
SearchContextHandlerMethodArgumentResolver resolver;
public static void main(String[] args) {
SpringApplication.run(iBizHumanResourcesHRApiApplication.class, args);
}
......@@ -47,6 +52,6 @@ public class iBizHumanResourcesHRApiApplication extends WebMvcConfigurerAdapter{
@Override
public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
super.addArgumentResolvers(argumentResolvers);
argumentResolvers.add(new cn.ibizlab.humanresource.util.web.SearchContextHandlerMethodArgumentResolver());
argumentResolvers.add(resolver);
}
}
......@@ -10,10 +10,16 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.method.support.ModelAndViewContainer;
import java.util.LinkedHashMap;
import java.util.Map;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
@Slf4j
@Configuration
public class SearchContextHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver {
@Value("${ibiz.pageLimit:1000}")
private int pageLimit=1000;
private static ObjectMapper objectMapper=new ObjectMapper();
@Override
......@@ -29,6 +35,9 @@ public class SearchContextHandlerMethodArgumentResolver implements HandlerMethod
for (String key : params.keySet()) {
set.put(key,params.get(key)[0]);
}
if((!set.containsKey("size")) ){
set.put("size",pageLimit);
}
String json=objectMapper.writeValueAsString(set);
return objectMapper.readValue(json,parameter.getParameterType());
}
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册