修改漏洞及添加网关拦截
This commit is contained in:
parent
b4fe8c0706
commit
43547fa0c9
|
|
@ -19,6 +19,8 @@ spring:
|
|||
nacos:
|
||||
enabled: true
|
||||
nacos:
|
||||
username: @nacos.username@
|
||||
password: @nacos.password@
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: @nacos.server@
|
||||
|
|
|
|||
|
|
@ -39,7 +39,12 @@ public class JwtUtils
|
|||
*/
|
||||
public static Claims parseToken(String token)
|
||||
{
|
||||
return Jwts.parser().setSigningKey(secret).parseClaimsJws(token).getBody();
|
||||
try{
|
||||
return Jwts.parser().setSigningKey(secret).parseClaimsJws(token).getBody();
|
||||
}catch (Exception e){
|
||||
System.err.println("token不正确--->"+token);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -51,6 +56,7 @@ public class JwtUtils
|
|||
public static String getUserKey(String token)
|
||||
{
|
||||
Claims claims = parseToken(token);
|
||||
assert claims != null;
|
||||
return getValue(claims, SecurityConstants.USER_KEY);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,43 @@
|
|||
package com.bonus.gateway.config;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author 黑子
|
||||
*/
|
||||
public class AuthWriteUtils {
|
||||
|
||||
|
||||
public static boolean endWith(String url){
|
||||
if(url.endsWith(".js")){
|
||||
return true;
|
||||
}else if(url.endsWith(".ttf")){
|
||||
return true;
|
||||
}else if(url.endsWith(".woff2")){
|
||||
return true;
|
||||
}else if(url.endsWith(".woff")){
|
||||
return true;
|
||||
}else if(url.endsWith(".ico")){
|
||||
return true;
|
||||
}else if(url.endsWith(".css")){
|
||||
return true;
|
||||
}else if(url.endsWith(".jpg")){
|
||||
return true;
|
||||
}else if(url.endsWith(".png")){
|
||||
return true;
|
||||
}else if(url.endsWith(".html")){
|
||||
return true;
|
||||
}else {
|
||||
return url.endsWith(".jpeg");
|
||||
}
|
||||
|
||||
}
|
||||
public static List<String> getBlackUrl(){
|
||||
List<String> whiteUrl=new ArrayList<>();
|
||||
whiteUrl.add("/bmw/**");
|
||||
return whiteUrl;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
package com.bonus.gateway.config;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.web.cors.CorsConfiguration;
|
||||
import org.springframework.web.cors.reactive.CorsWebFilter;
|
||||
import org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource;
|
||||
import org.springframework.web.util.pattern.PathPatternParser;
|
||||
|
||||
/**
|
||||
* 跨域处理请求配置
|
||||
* @author 黑子
|
||||
*/
|
||||
@Configuration
|
||||
public class CorsConfig {
|
||||
@Bean
|
||||
public CorsWebFilter corsFilter() {
|
||||
CorsConfiguration config = new CorsConfiguration();
|
||||
// 是什么请求方法,比如GET POST PUT DELATE ...
|
||||
config.addAllowedMethod("*");
|
||||
// 来自哪个域名的请求,*号表示所有
|
||||
config.addAllowedOrigin("*");
|
||||
// 来自哪个域名的请求,*号表示所有
|
||||
config.addAllowedOriginPattern("*");
|
||||
// 是什么请求头部
|
||||
config.addAllowedHeader("*");
|
||||
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(new PathPatternParser());
|
||||
source.registerCorsConfiguration("/**", config);
|
||||
return new CorsWebFilter(source);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
package com.bonus.gateway.filter;
|
||||
|
||||
import com.bonus.gateway.config.AuthWriteUtils;
|
||||
import com.bonus.gateway.config.properties.IgnoreWhiteProperties;
|
||||
import com.bonus.common.core.constant.CacheConstants;
|
||||
import com.bonus.common.core.constant.HttpStatus;
|
||||
|
|
@ -46,6 +47,12 @@ public class AuthFilter implements GlobalFilter, Ordered
|
|||
ServerHttpRequest.Builder mutate = request.mutate();
|
||||
|
||||
String url = request.getURI().getPath();
|
||||
if (StringUtils.matches(url, AuthWriteUtils.getBlackUrl()))
|
||||
{
|
||||
if(AuthWriteUtils.endWith(url)){
|
||||
return chain.filter(exchange);
|
||||
}
|
||||
}
|
||||
// 跳过不需要验证的路径
|
||||
if (StringUtils.matches(url, ignoreWhite.getWhites()))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
# Tomcat
|
||||
server:
|
||||
port: 9100
|
||||
servlet:
|
||||
context-path: ynRealName
|
||||
|
||||
# Spring
|
||||
spring:
|
||||
|
|
@ -12,6 +14,8 @@ spring:
|
|||
active: @profiles.active@
|
||||
cloud:
|
||||
nacos:
|
||||
username: @nacos.username@
|
||||
password: @nacos.password@
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: @nacos.server@
|
||||
|
|
@ -25,18 +29,30 @@ spring:
|
|||
shared-configs:
|
||||
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
|
||||
namespace: @name.space@
|
||||
|
||||
sentinel:
|
||||
# 取消控制台懒加载
|
||||
eager: true
|
||||
transport:
|
||||
# 控制台地址
|
||||
server-addr: 192.168.1.4:8858
|
||||
server-addr: @nacos.server@
|
||||
# nacos配置持久化
|
||||
datasource:
|
||||
ds1:
|
||||
nacos:
|
||||
server-addr: 192.168.1.4:8848
|
||||
server-addr: @nacos.server@
|
||||
dataId: sentinel-gateway
|
||||
groupId: DEFAULT_GROUP
|
||||
data-type: json
|
||||
rule-type: flow
|
||||
management:
|
||||
server:
|
||||
port: -1
|
||||
endpoints:
|
||||
web:
|
||||
exposure:
|
||||
exclude: []
|
||||
enabled-by-default: false
|
||||
endpoint:
|
||||
beans:
|
||||
enabled: false
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
# Tomcat
|
||||
server:
|
||||
port: 1913
|
||||
servlet:
|
||||
context-path: /app
|
||||
# servlet:
|
||||
# context-path: /app
|
||||
|
||||
# Spring
|
||||
spring:
|
||||
|
|
@ -14,6 +14,8 @@ spring:
|
|||
active: @profiles.active@
|
||||
cloud:
|
||||
nacos:
|
||||
username: @nacos.username@
|
||||
password: @nacos.password@
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: @nacos.server@
|
||||
|
|
|
|||
|
|
@ -1,43 +0,0 @@
|
|||
package com.bonus.app.pay.service;
|
||||
|
||||
import com.bonus.app.pay.entity.PayCardBean;
|
||||
import junit.framework.TestCase;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.test.context.junit4.SpringRunner;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
/**
|
||||
* 工资卡见证测试类
|
||||
*
|
||||
* @param
|
||||
* @return
|
||||
*/
|
||||
@RunWith(SpringRunner.class)
|
||||
@SpringBootTest
|
||||
public class PayCardServiceImplTest extends TestCase {
|
||||
@Resource(name = "payCardService")
|
||||
private PayCardService payCardService;
|
||||
|
||||
@Test
|
||||
public void testInsertPayCard() {
|
||||
PayCardBean bean = new PayCardBean();
|
||||
bean.setIdNumber("111111");
|
||||
bean.setPath("xxxxx");
|
||||
bean.setUploadTime("2022-08-23");
|
||||
bean.setUploadDate("2022-08-23");
|
||||
bean.setBankCard("2134444433333");
|
||||
bean.setBankName("银行名");
|
||||
bean.setBankRollName("银行支行");
|
||||
payCardService.insertPayCard(bean);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetproNameByproId() {
|
||||
PayCardBean bean = new PayCardBean();
|
||||
bean.setProId("3");
|
||||
payCardService.getproNameByproId(bean);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
package com.bonus.app.pay.service;
|
||||
|
||||
import com.bonus.app.pay.entity.SalaryBookBean;
|
||||
import junit.framework.TestCase;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.test.context.junit4.SpringRunner;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
/**
|
||||
* 工资查看测试类
|
||||
*
|
||||
* @param
|
||||
* @return
|
||||
*/
|
||||
@RunWith(SpringRunner.class)
|
||||
@SpringBootTest
|
||||
public class PayViewServiceImplTest extends TestCase {
|
||||
@Resource(name ="payViewService")
|
||||
private PayViewService payViewService;
|
||||
|
||||
@Test
|
||||
public void testGetSalaryBookList() {
|
||||
SalaryBookBean bean=new SalaryBookBean();
|
||||
bean.setProId("3");
|
||||
payViewService.getSalaryBookList(bean);
|
||||
}
|
||||
@Test
|
||||
public void testGetPayrollNameList() {
|
||||
SalaryBookBean bean=new SalaryBookBean();
|
||||
bean.setProId("3");
|
||||
payViewService.getPayrollNameList(bean);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
package com.bonus.app.person.service;
|
||||
|
||||
import com.bonus.app.person.entity.FaceAttendanceBean;
|
||||
import com.bonus.common.core.domain.R;
|
||||
import junit.framework.TestCase;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.test.context.junit4.SpringRunner;
|
||||
import javax.annotation.Resource;
|
||||
|
||||
@Slf4j
|
||||
@RunWith(SpringRunner.class)
|
||||
@SpringBootTest
|
||||
public class BasePersonServiceImplTest extends TestCase {
|
||||
|
||||
@Resource(name = "basePersonService")
|
||||
private BasePersonService basePersonService;
|
||||
|
||||
@Test
|
||||
public void testUploadFaceAttendance() {
|
||||
FaceAttendanceBean faceAttendanceBean = new FaceAttendanceBean();
|
||||
faceAttendanceBean.setIdNumber("130634197410192218");
|
||||
faceAttendanceBean.setProId("72");
|
||||
faceAttendanceBean.setName("1");
|
||||
faceAttendanceBean.setPhotoPath("ynRealName/no_existent/photoExistent.png");
|
||||
faceAttendanceBean.setCurrentDay("2023-02-07");
|
||||
faceAttendanceBean.setAddTime("2023-02-07 10:34:15");
|
||||
faceAttendanceBean.setUploadType("1");
|
||||
faceAttendanceBean.setLon("1");
|
||||
faceAttendanceBean.setLat("1");
|
||||
// R r = basePersonService.uploadFaceAttendance(faceAttendanceBean);
|
||||
// log.info(r.getMsg() + "," + r.getData());
|
||||
}
|
||||
}
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
package com.bonus.app.person.service;
|
||||
|
||||
import com.bonus.app.person.entity.ContractWitnessBean;
|
||||
import junit.framework.TestCase;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.test.context.junit4.SpringRunner;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
/**
|
||||
* 合同见证测试类
|
||||
*
|
||||
* @param
|
||||
* @return
|
||||
*/
|
||||
@RunWith(SpringRunner.class)
|
||||
@SpringBootTest
|
||||
public class ContractWitnessServiceImplTest extends TestCase {
|
||||
@Resource(name = "contractWitnessService")
|
||||
private ContractWitnessService contractWitnessService;
|
||||
|
||||
@Test
|
||||
public void testUploadContract() {
|
||||
ContractWitnessBean bean=new ContractWitnessBean();
|
||||
bean.setId("1234567");
|
||||
bean.setIdNumber("123456");
|
||||
bean.setWitnessPath("xxxxxx");
|
||||
bean.setUploadDate("2022-08-23");
|
||||
bean.setUploadTime("2022-08-23");
|
||||
bean.setUploadId("11");
|
||||
bean.setContractCode("1");
|
||||
bean.setRole("1");
|
||||
bean.setLaborContractType("1");
|
||||
bean.setContractValidDate("2022-08-23");
|
||||
bean.setContractInvalidDate("2022-08-23");
|
||||
bean.setContractType("1");
|
||||
bean.setIsYiLiao("是");
|
||||
bean.setIsYangLao("是");
|
||||
bean.setWageApprovedWay("1");
|
||||
bean.setWageCriterion("1");
|
||||
bean.setWhetherOnJob("1");
|
||||
contractWitnessService.uploadContract(bean);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testReplaceContract() {
|
||||
ContractWitnessBean bean=new ContractWitnessBean();
|
||||
bean.setIdNumber("123456");
|
||||
contractWitnessService.replaceContract(bean.getIdNumber(),"2");
|
||||
}
|
||||
}
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
package com.bonus.app.person.service;
|
||||
|
||||
import com.bonus.app.person.entity.FaceContrastBean;
|
||||
import com.bonus.app.person.entity.Page;
|
||||
import junit.framework.TestCase;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.test.context.junit4.SpringRunner;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
/**
|
||||
* 考勤统计测试类
|
||||
*
|
||||
* @param
|
||||
* @return
|
||||
*/
|
||||
@RunWith(SpringRunner.class)
|
||||
@SpringBootTest
|
||||
public class FaceContrastServiceImplTest extends TestCase {
|
||||
@Resource(name = "faceContrastService")
|
||||
private FaceContrastService faceContrastService;
|
||||
|
||||
@Test
|
||||
public void testGetFaceContrastList() {
|
||||
Page<FaceContrastBean> page = new Page<>();
|
||||
page.setPageNo(0);
|
||||
page.setPageSize(50);
|
||||
faceContrastService.getFaceContrastList(page, "3", "", "2022-08-10", "2022-09-10");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetFaceContrastListById() {
|
||||
faceContrastService.getFaceContrastListById("341221199908023417", "2022-08-10", "2022-09-10", "3");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetManagerFaceContrastList() {
|
||||
Page<FaceContrastBean> page = new Page<>();
|
||||
page.setPageNo(0);
|
||||
page.setPageSize(50);
|
||||
faceContrastService.getManagerFaceContrastList(page, "3", "", "2022-08-10", "2022-09-10");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetManagerFaceContrastListById() {
|
||||
faceContrastService.getManagerFaceContrastListById("1122", "2022-08-10", "2022-09-10");
|
||||
}
|
||||
}
|
||||
|
|
@ -1,74 +0,0 @@
|
|||
package com.bonus.app.person.service;
|
||||
|
||||
import com.bonus.app.person.entity.SafeguardingBean;
|
||||
import junit.framework.TestCase;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.test.context.junit4.SpringRunner;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
/**
|
||||
* 欠薪维权申诉测试类
|
||||
*
|
||||
* @param
|
||||
* @return
|
||||
*/
|
||||
@RunWith(SpringRunner.class)
|
||||
@SpringBootTest
|
||||
public class SafeguardingInfoServiceImplTest extends TestCase {
|
||||
@Resource(name = "safeguardingInfoService")
|
||||
private SafeguardingInfoService safeguardingInfoService;
|
||||
|
||||
@Test
|
||||
public void testUploadSafeguardingInfo() {
|
||||
SafeguardingBean bean=new SafeguardingBean();
|
||||
bean.setUploadUserId("1");
|
||||
bean.setId("11133");
|
||||
bean.setOweCompany("1");
|
||||
bean.setOweProject("1");
|
||||
bean.setAddress("2");
|
||||
bean.setApplayUser("1");
|
||||
bean.setIdCard("123123");
|
||||
bean.setPhone("123234");
|
||||
bean.setOweStartDay("2022-08-22");
|
||||
bean.setOweEndDay("2022-08-23");
|
||||
bean.setRepresentationTime("2022-08-23");
|
||||
bean.setUploadUserId("1");
|
||||
bean.setAddTime("2022-08-23");
|
||||
bean.setCurrentDay("2022-08-23");
|
||||
bean.setReplyStatus("2");
|
||||
bean.setReplyContent("2");
|
||||
safeguardingInfoService.uploadSafeguardingInfo(bean);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUploadSafeguardingPhoto() {
|
||||
SafeguardingBean bean=new SafeguardingBean();
|
||||
bean.setSafeguardingId("1");
|
||||
bean.setPath("xxxx");
|
||||
bean.setType("1");
|
||||
bean.setUploadUserId("1");
|
||||
bean.setAddTime("2022-08-23");
|
||||
bean.setCurrentDay("2022-08-23");
|
||||
safeguardingInfoService.uploadSafeguardingPhoto(bean);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetSafeguardingInfoList() {
|
||||
SafeguardingBean bean=new SafeguardingBean();
|
||||
bean.setUploadUserId("1");
|
||||
safeguardingInfoService.getSafeguardingInfoList(bean.getUploadUserId());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetSafeguardingInfoById() {
|
||||
safeguardingInfoService.getSafeguardingInfoById("1");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGetSafeguardingPhotoById() {
|
||||
safeguardingInfoService.getSafeguardingPhotoById("1");
|
||||
}
|
||||
}
|
||||
|
|
@ -1,54 +0,0 @@
|
|||
package com.bonus.app.person.service;
|
||||
|
||||
import com.bonus.app.person.entity.EducationTrainBean;
|
||||
import com.bonus.app.person.entity.TrainBean;
|
||||
import junit.framework.TestCase;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.test.context.junit4.SpringRunner;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 教育培训测试类
|
||||
*
|
||||
* @param
|
||||
* @return
|
||||
*/
|
||||
@RunWith(SpringRunner.class)
|
||||
@SpringBootTest
|
||||
public class TrainVideoServiceImplTest extends TestCase {
|
||||
@Resource(name = "trainVideoService")
|
||||
private TrainVideoService trainVideoService;
|
||||
|
||||
@Test
|
||||
public void testSelectTrainVideo() {
|
||||
EducationTrainBean bean = new EducationTrainBean();
|
||||
bean.setPostId("23");
|
||||
trainVideoService.selectTrainVideo(bean);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testInsertTrainVideo() {
|
||||
List<TrainBean> bean = new ArrayList<>();
|
||||
TrainBean bean1 = new TrainBean();
|
||||
bean1.setIdNumber("341221199908023417");
|
||||
bean1.setProId("3");
|
||||
bean1.setTrainId("1");
|
||||
bean1.setStartTime("2022-08-23");
|
||||
bean1.setStopTime("2022-08-23");
|
||||
bean.add(bean1);
|
||||
trainVideoService.insertTrainVideo(bean);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSelectHistory() {
|
||||
EducationTrainBean bean = new EducationTrainBean();
|
||||
bean.setProId("3");
|
||||
trainVideoService.selectHistory(bean);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,74 +0,0 @@
|
|||
package com.bonus.app.person.service;
|
||||
|
||||
import com.bonus.app.person.entity.UploadCertificateBean;
|
||||
import junit.framework.TestCase;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.test.context.junit4.SpringRunner;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
/**
|
||||
* 持证上传测试类
|
||||
*
|
||||
* @param
|
||||
* @return
|
||||
*/
|
||||
@RunWith(SpringRunner.class)
|
||||
@SpringBootTest
|
||||
public class UploadCertificateServiceImplTest extends TestCase {
|
||||
@Resource(name = "uploadCertificateService")
|
||||
private UploadCertificateService uploadCertificateService;
|
||||
|
||||
@Test
|
||||
public void testSelectCertificateType() {
|
||||
UploadCertificateBean bean = new UploadCertificateBean();
|
||||
uploadCertificateService.selectCertificateType(bean);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSelectUploadCertificate() {
|
||||
UploadCertificateBean bean = new UploadCertificateBean();
|
||||
uploadCertificateService.selectUploadCertificate(bean);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSelectCertificate() {
|
||||
UploadCertificateBean bean = new UploadCertificateBean();
|
||||
bean.setKeyword("1234");
|
||||
uploadCertificateService.selectCertificate(bean);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testInsertCertificate() {
|
||||
UploadCertificateBean bean = new UploadCertificateBean();
|
||||
bean.setCertificateId("2");
|
||||
bean.setIdNumber("123123");
|
||||
bean.setCertificatesFile("xxxxx");
|
||||
bean.setCertificateTypeFile("xxx");
|
||||
bean.setStartDate("2022-08-10");
|
||||
bean.setStopDate("2022-08-23");
|
||||
uploadCertificateService.insertCertificate(bean);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
public void testDeleteCertificate() {
|
||||
UploadCertificateBean bean = new UploadCertificateBean();
|
||||
bean.setId("1234567");
|
||||
uploadCertificateService.deleteCertificate(bean);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUpdateCertificate() {
|
||||
UploadCertificateBean bean = new UploadCertificateBean();
|
||||
bean.setCertificateId("1123");
|
||||
bean.setCertificatesFile("xxxxx");
|
||||
bean.setCertificateTypeFile("xxxxx");
|
||||
bean.setStartDate("2022-08-10");
|
||||
bean.setStopDate("2022-08-23");
|
||||
bean.setId("123456");
|
||||
uploadCertificateService.updateCertificate(bean);
|
||||
}
|
||||
}
|
||||
|
|
@ -13,8 +13,8 @@ server:
|
|||
buffered: true
|
||||
requestAttributesEnabled: true
|
||||
port: 1911
|
||||
servlet:
|
||||
context-path: /bmw
|
||||
# servlet:
|
||||
# context-path: /bmw
|
||||
|
||||
environment: @profiles.active@
|
||||
|
||||
|
|
@ -28,6 +28,8 @@ spring:
|
|||
active: @profiles.active@
|
||||
cloud:
|
||||
nacos:
|
||||
username: @nacos.username@
|
||||
password: @nacos.password@
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: @nacos.server@
|
||||
|
|
@ -41,3 +43,14 @@ spring:
|
|||
shared-configs:
|
||||
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
|
||||
namespace: @name.space@
|
||||
management:
|
||||
server:
|
||||
port: -1
|
||||
endpoints:
|
||||
web:
|
||||
exposure:
|
||||
exclude: []
|
||||
enabled-by-default: false
|
||||
endpoint:
|
||||
beans:
|
||||
enabled: false
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ function getDict(type) {
|
|||
let v = {};
|
||||
$.ajax({
|
||||
type : 'post',
|
||||
url : systemPath + '/dicts',
|
||||
url : IP_URL + '/system/dicts',
|
||||
data : {
|
||||
"type" : type
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,5 +1,14 @@
|
|||
let Authorization = localStorage.getItem("smz-token");
|
||||
|
||||
|
||||
$(document).ajaxSuccess(function (event, xhr, settings, data) {
|
||||
if(data.code===401){
|
||||
localStorage.removeItem("smz-token");
|
||||
top.location.href = IP_URL + '/bmw/login.html';
|
||||
}
|
||||
return data;
|
||||
});
|
||||
|
||||
$.ajaxSetup({
|
||||
cache : false,
|
||||
headers : {
|
||||
|
|
@ -22,7 +31,7 @@ $.ajaxSetup({
|
|||
layer.msg(message);
|
||||
} else if (code == 401) {
|
||||
localStorage.removeItem("smz-token");
|
||||
location.href = '/login.html';
|
||||
top.location.href = IP_URL + '/bmw/login.html';
|
||||
} else if (code == 403) {
|
||||
console.log("未授权:" + message);
|
||||
layer.msg('未授权');
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ function logout() {
|
|||
|
||||
$.ajax({
|
||||
type: 'delete',
|
||||
url: loginPath + '/logout',
|
||||
url: IP_URL + '/auth/logout',
|
||||
headers: {
|
||||
"Authorization": token
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,16 +1,13 @@
|
|||
var ctxPath = getContextPath();
|
||||
var currentHostname = window.location.hostname;
|
||||
|
||||
let IP_URL="http://127.0.0.1:9100/ynRealName"
|
||||
|
||||
// //测试
|
||||
// var loginPath = "http://" + currentHostname + ":9200";
|
||||
// var systemPath = "http://" + currentHostname + ":1910";
|
||||
var loginPath = "http://" + currentHostname + ":1616/auth";
|
||||
var systemPath = "http://" + currentHostname + ":1616/system";
|
||||
var filePath = "http://" + currentHostname + ":1909/file";
|
||||
var fileUrl = "http://" + currentHostname + ":1909/file";
|
||||
var planUrl = "http://" + currentHostname + ":1918/ynPlan";
|
||||
var oiPlanUrl = "http://" + currentHostname + ":1914/oiPlan";
|
||||
var filePath =IP_URL + "/file";
|
||||
var fileUrl =IP_URL +"/file";
|
||||
var oiPlanUrl = IP_URL + "/oiPlan";
|
||||
|
||||
//112.29.103.165:1616
|
||||
//正式环境
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ function getAttendanceMachineByProId(proId) {
|
|||
let attendanceMachine;
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getAttendanceMachineByProId',
|
||||
url: IP_URL + '/system/select/getAttendanceMachineByProId',
|
||||
data: {
|
||||
proId: proId
|
||||
},
|
||||
|
|
@ -45,7 +45,7 @@ function getProBySubId(subId,proId) {
|
|||
$("#proId").empty();
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getProBySubId',
|
||||
url: IP_URL + '/system/select/getProBySubId',
|
||||
data: {
|
||||
subId: subId
|
||||
},
|
||||
|
|
@ -78,7 +78,7 @@ function getSubByProId(proId, subId) {
|
|||
$("#subId").empty();
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getSubByProId',
|
||||
url: IP_URL + '/system/select/getSubByProId',
|
||||
data: {
|
||||
proId: proId
|
||||
},
|
||||
|
|
@ -408,7 +408,7 @@ function getCompany(companyId) {
|
|||
$("#companyId").html("");
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getCompany',
|
||||
url: IP_URL + '/system/select/getCompany',
|
||||
async: false,
|
||||
success: function (data) {
|
||||
if(data.code == 200){
|
||||
|
|
@ -437,7 +437,7 @@ function getCompanyAndSubCompany(orgId) {
|
|||
$("#orgId").html("");
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getCompanyAndSubCompany',
|
||||
url: IP_URL + '/system/select/getCompanyAndSubCompany',
|
||||
async: false,
|
||||
success: function (data) {
|
||||
if(data.code == 200){
|
||||
|
|
@ -488,7 +488,7 @@ function getSubCompany(orgId) {
|
|||
$("#subComId").html("");
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getSubCompany',
|
||||
url: IP_URL + '/system/select/getSubCompany',
|
||||
async: false,
|
||||
success: function (data) {
|
||||
if(data.code == 200){
|
||||
|
|
@ -516,7 +516,7 @@ function getProByCompanyId(companyId,proId) {
|
|||
$("#proId").empty();
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getPro',
|
||||
url: IP_URL + '/system/select/getPro',
|
||||
data: {
|
||||
companyId: companyId
|
||||
},
|
||||
|
|
@ -548,7 +548,7 @@ function getProByOrgId(orgId,type,proId) {
|
|||
$("#proId").empty();
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getProByOrgId',
|
||||
url: IP_URL + '/system/select/getProByOrgId',
|
||||
data: {
|
||||
orgId: orgId,
|
||||
type:type
|
||||
|
|
@ -580,7 +580,7 @@ function getProByTeamId(proId, teamId) {
|
|||
$("#proId").empty();
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getProByTeamId',
|
||||
url: IP_URL + '/system/select/getProByTeamId',
|
||||
data: {
|
||||
proId: proId,
|
||||
teamId:teamId
|
||||
|
|
@ -612,7 +612,7 @@ function getTeamByProId(proId,teamId) {
|
|||
$("#teamId").empty();
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getTeamByProId',
|
||||
url: IP_URL + '/system/select/getTeamByProId',
|
||||
data: {
|
||||
proId: proId
|
||||
},
|
||||
|
|
@ -647,7 +647,7 @@ function getTeamBySubId(subId,teamId) {
|
|||
$("#teamId").empty();
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getTeamBySubId',
|
||||
url: IP_URL + '/system/select/getTeamBySubId',
|
||||
data: {
|
||||
subId: subId
|
||||
},
|
||||
|
|
@ -677,7 +677,7 @@ function getSub(subId) {
|
|||
$("#subId").empty();
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getSub',
|
||||
url: IP_URL + '/system/select/getSub',
|
||||
async: false,
|
||||
success: function (data) {
|
||||
console.log("获取分包下拉列表OK");
|
||||
|
|
@ -705,7 +705,7 @@ function getCerSub(subId) {
|
|||
$("#subId").empty();
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getCerSub',
|
||||
url: IP_URL + '/system/select/getCerSub',
|
||||
async: false,
|
||||
success: function (data) {
|
||||
console.log("获取分包下拉列表OK");
|
||||
|
|
@ -736,7 +736,7 @@ function getSubContract(subContractId,subId) {
|
|||
$("#subContractId").empty();
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getSubContract',
|
||||
url: IP_URL + '/system/select/getSubContract',
|
||||
async: false,
|
||||
data: {
|
||||
subId: subId
|
||||
|
|
@ -768,7 +768,7 @@ function getProBySubContract(proId,subContractId) {
|
|||
$("#projectId").empty();
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getProBySubContract',
|
||||
url: IP_URL + '/system/select/getProBySubContract',
|
||||
async: false,
|
||||
data: {
|
||||
subContractId: subContractId
|
||||
|
|
@ -795,7 +795,7 @@ function getCertificate(certificateId) {
|
|||
$("#name").empty();
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getCertificate',
|
||||
url: IP_URL + '/system/select/getCertificate',
|
||||
async: false,
|
||||
success: function (data) {
|
||||
console.log("获取证件下拉列表OK");
|
||||
|
|
@ -825,7 +825,7 @@ function getTDict(id, type, key) {
|
|||
$("#"+id).empty();
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getTDict',
|
||||
url: IP_URL + '/system/select/getTDict',
|
||||
data: {
|
||||
type: type
|
||||
},
|
||||
|
|
@ -857,7 +857,7 @@ function getCertificateSub() {
|
|||
$("#certificateName").empty();
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getCertificateSub',
|
||||
url: IP_URL + '/system/select/getCertificateSub',
|
||||
async: false,
|
||||
success: function (data) {
|
||||
console.log("获取证件下拉列表OK");
|
||||
|
|
@ -887,7 +887,7 @@ function getRole(companyId,roleId) {
|
|||
$("#roleId").html("");
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getRole',
|
||||
url: IP_URL + '/system/select/getRole',
|
||||
data: {
|
||||
companyId: companyId
|
||||
},
|
||||
|
|
@ -918,7 +918,7 @@ function getRoleByLevel(roleId,level) {
|
|||
$("#roleId").html("");
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getRoleByLevel',
|
||||
url: IP_URL + '/system/select/getRoleByLevel',
|
||||
data: {
|
||||
level: level
|
||||
},
|
||||
|
|
@ -988,7 +988,7 @@ function getRiskSelect(type,id) {
|
|||
function getProListByOrg(type) {
|
||||
$.ajax({
|
||||
type: 'GET',
|
||||
url: systemPath + '/select/getProListByOrg',
|
||||
url: IP_URL + '/system/select/getProListByOrg',
|
||||
data: {
|
||||
'type':type
|
||||
},
|
||||
|
|
@ -1015,7 +1015,7 @@ function getOrg(orgId) {
|
|||
$("#orgId").empty();
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getOrg',
|
||||
url: IP_URL + '/system/select/getOrg',
|
||||
data: {
|
||||
orgId: orgId
|
||||
},
|
||||
|
|
@ -1041,7 +1041,7 @@ function getOrg(orgId) {
|
|||
function getProListByOrg(type) {
|
||||
$.ajax({
|
||||
type: 'GET',
|
||||
url: systemPath + '/select/getProListByOrg',
|
||||
url: IP_URL + '/system/select/getProListByOrg',
|
||||
data: {
|
||||
'type':type
|
||||
},
|
||||
|
|
@ -1065,7 +1065,7 @@ function getRiskLevelLists() {
|
|||
let riskLevelList = [];
|
||||
$.ajax({
|
||||
type: 'GET',
|
||||
url: systemPath + '/select/getRiskLevelLists',
|
||||
url: IP_URL + '/system/select/getRiskLevelLists',
|
||||
dataType: 'json',
|
||||
async: false,
|
||||
success: function (result) {
|
||||
|
|
@ -1091,7 +1091,7 @@ function getProBuildByOrgId(orgId, type, proId) {
|
|||
$("#proId").empty();
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getProBuildByOrgId',
|
||||
url: IP_URL + '/system/select/getProBuildByOrgId',
|
||||
data: {
|
||||
orgId: orgId,
|
||||
type: type
|
||||
|
|
@ -1119,7 +1119,7 @@ function getPlanAuditor() {
|
|||
$("#auditorId").empty();
|
||||
$.ajax({
|
||||
type: 'GET',
|
||||
url: systemPath + '/select/getPlanAuditor',
|
||||
url: IP_URL + '/system/select/getPlanAuditor',
|
||||
dataType: 'json',
|
||||
async: false,
|
||||
success: function (data) {
|
||||
|
|
@ -1144,7 +1144,7 @@ function getCompanyPlanAuditor(type) {
|
|||
$("#auditorId").empty();
|
||||
$.ajax({
|
||||
type: 'GET',
|
||||
url: systemPath + '/select/getCompanyPlanAuditor',
|
||||
url: IP_URL + '/system/select/getCompanyPlanAuditor',
|
||||
dataType: 'json',
|
||||
data:{
|
||||
type:type
|
||||
|
|
@ -1172,7 +1172,7 @@ function getControlLevelLists() {
|
|||
let controlLevelLists = [];
|
||||
$.ajax({
|
||||
type: 'GET',
|
||||
url: systemPath + '/select/getControlLevelLists',
|
||||
url: IP_URL + '/system/select/getControlLevelLists',
|
||||
dataType: 'json',
|
||||
async: false,
|
||||
success: function (result) {
|
||||
|
|
@ -1193,7 +1193,7 @@ function getControlMethodLists() {
|
|||
let controlMethodLists = [];
|
||||
$.ajax({
|
||||
type: 'GET',
|
||||
url: systemPath + '/select/getControlMethodLists',
|
||||
url: IP_URL + '/system/select/getControlMethodLists',
|
||||
dataType: 'json',
|
||||
async: false,
|
||||
success: function (result) {
|
||||
|
|
@ -1214,7 +1214,7 @@ function getJobTypeLists() {
|
|||
let jobTypeLists = [];
|
||||
$.ajax({
|
||||
type: 'GET',
|
||||
url: systemPath + '/select/getJobTypeLists',
|
||||
url: IP_URL + '/system/select/getJobTypeLists',
|
||||
dataType: 'json',
|
||||
async: false,
|
||||
success: function (result) {
|
||||
|
|
@ -1238,8 +1238,8 @@ function getNoticeSelect() {
|
|||
$("#noticeType").html("");
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getNoticeType',
|
||||
// url: systemPath + '/select/getPro',
|
||||
url: IP_URL + '/system/select/getNoticeType',
|
||||
// url: IP_URL + '/system/select/getPro',
|
||||
async: false,
|
||||
dataType: 'json',
|
||||
success: function (data) {
|
||||
|
|
@ -1261,7 +1261,7 @@ function getQuestionBank() {
|
|||
$("#questionBankId").empty();
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getQuestionBank',
|
||||
url: IP_URL + '/system/select/getQuestionBank',
|
||||
data: {},
|
||||
async: false,
|
||||
success: function (data) {
|
||||
|
|
|
|||
|
|
@ -1242,7 +1242,7 @@ function titleStyle(){
|
|||
function getTeamBySubIdToData(subId,teamId) {
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getTeamBySubId',
|
||||
url: IP_URL + '/system/select/getTeamBySubId',
|
||||
data: {
|
||||
subId: subId
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1347,7 +1347,7 @@ function titleStyle(){
|
|||
function getTeamBySubIdToData(subId,teamId) {
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getTeamBySubId',
|
||||
url: IP_URL + '/system/select/getTeamBySubId',
|
||||
data: {
|
||||
subId: subId
|
||||
},
|
||||
|
|
|
|||
|
|
@ -312,7 +312,7 @@ function prevClick(e){
|
|||
function getTeamBySubIdToData(subId,teamId) {
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getTeamBySubId',
|
||||
url: IP_URL + '/system/select/getTeamBySubId',
|
||||
data: {
|
||||
subId: subId
|
||||
},
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ function getPlanAuditor() {
|
|||
$("#auditorId").empty();
|
||||
$.ajax({
|
||||
type: 'GET',
|
||||
url: systemPath + '/select/getPlanAuditor',
|
||||
url: IP_URL + '/system/select/getPlanAuditor',
|
||||
dataType: 'json',
|
||||
async: false,
|
||||
success: function (data) {
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ function getPlanAuditor() {
|
|||
$("#auditorId").empty();
|
||||
$.ajax({
|
||||
type: 'GET',
|
||||
url: systemPath + '/select/getCompanyPlanAuditor',
|
||||
url: IP_URL + '/system/select/getCompanyPlanAuditor',
|
||||
dataType: 'json',
|
||||
data: {
|
||||
"type": 'produceCompanyAuditor'
|
||||
|
|
|
|||
|
|
@ -244,7 +244,7 @@ function getProByOrgId(orgId,type,proId) {
|
|||
$("#proId").empty();
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getProByOrgId',
|
||||
url: IP_URL + '/system/select/getProByOrgId',
|
||||
data: {
|
||||
orgId: orgId,
|
||||
type:type
|
||||
|
|
|
|||
|
|
@ -641,7 +641,7 @@ function getProByOrgId(orgId,type,proId) {
|
|||
$("#proId").empty();
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getProByOrgId',
|
||||
url: IP_URL + '/system/select/getProByOrgId',
|
||||
data: {
|
||||
orgId: orgId,
|
||||
type:type
|
||||
|
|
|
|||
|
|
@ -696,7 +696,7 @@ function getProByOrgId(orgId,type,proId) {
|
|||
$("#proId").empty();
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getProByOrgId',
|
||||
url: IP_URL + '/system/select/getProByOrgId',
|
||||
data: {
|
||||
orgId: orgId,
|
||||
type:type
|
||||
|
|
|
|||
|
|
@ -22,9 +22,9 @@ $(function () {
|
|||
,done: function(res){
|
||||
layer.msg('上传成功');
|
||||
console.log(res);
|
||||
console.log(systemPath + res.data.url);
|
||||
console.log(IP_URL + res.data.url);
|
||||
$("#path").val(res.data.url);
|
||||
layui.$('#uploadDemoView').removeClass('layui-hide').find('img').attr('src', systemPath + "/" + res.data.url);
|
||||
layui.$('#uploadDemoView').removeClass('layui-hide').find('img').attr('src', IP_URL + "/system/" + res.data.url);
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -152,7 +152,7 @@ function setData(data) {
|
|||
$("#issue").val(data.issue);
|
||||
$("#solution").val(data.solution);
|
||||
if (data.path != null) {
|
||||
layui.$('#uploadDemoView').removeClass('layui-hide').find('img').attr('src', systemPath + "/" + data.path);
|
||||
layui.$('#uploadDemoView').removeClass('layui-hide').find('img').attr('src', IP_URL + "/system/" + data.path);
|
||||
}
|
||||
layuiForm.render('select');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ function getPlanAuditor() {
|
|||
$("#auditorId").empty();
|
||||
$.ajax({
|
||||
type: 'GET',
|
||||
url: systemPath + '/select/getPlanAuditor',
|
||||
url: IP_URL + '/system/select/getPlanAuditor',
|
||||
dataType: 'json',
|
||||
async: false,
|
||||
success: function (data) {
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ function getPlanAuditor() {
|
|||
$("#auditorId").empty();
|
||||
$.ajax({
|
||||
type: 'GET',
|
||||
url: systemPath + '/select/getCompanyPlanAuditor',
|
||||
url: IP_URL + '/system/select/getCompanyPlanAuditor',
|
||||
dataType: 'json',
|
||||
data: {
|
||||
"type": 'buildCompanyAuditor'
|
||||
|
|
|
|||
|
|
@ -536,7 +536,7 @@ function getProByOrgId(orgId,type,proId) {
|
|||
$("#proId").empty();
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getProByOrgId',
|
||||
url: IP_URL + '/system/select/getProByOrgId',
|
||||
data: {
|
||||
orgId: orgId,
|
||||
type:type
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ layui.use(['upload'], function () {
|
|||
var uploadListIns = upload.render({
|
||||
elem: '#ID-upload-demo-files',
|
||||
elemList: $('#ID-upload-demo-files-list'), // 列表元素对象
|
||||
url: filePath + "/file/upload", // 实际使用时改成您自己的上传接口即可。
|
||||
url: IP_URL + "/file/file/upload", // 实际使用时改成您自己的上传接口即可。
|
||||
multiple: true, //是否允许多文件上传,默认未false
|
||||
dataType: "json",
|
||||
// exts: 'jpg|png|jpeg|txt|pdf|xlsx|xls|docx|doc|ppt|pptx|mp4|avi|flv',
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ function init() {
|
|||
"url": ctxPath + "/js/plugin/datatables/Chinese.lang"
|
||||
},
|
||||
"ajax": {
|
||||
"url": systemPath + "/operlog/getAllList",
|
||||
"url": IP_URL + "/system/operlog/getAllList",
|
||||
"type": "post",
|
||||
"data": function (d) {
|
||||
d.keyWord = $('#keyWord').val();
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ function getOwnRole(companyId,roleId) {
|
|||
$("#roleId").empty();
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getRole',
|
||||
url: IP_URL + '/system/select/getRole',
|
||||
data: {
|
||||
companyId:companyId
|
||||
},
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ function getPrincipal(subId, userId) {
|
|||
$("#principal").empty();
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getPrincipal',
|
||||
url: IP_URL + '/system/select/getPrincipal',
|
||||
data: {subId: subId},
|
||||
async: false,
|
||||
success: function (data) {
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ layui.use(['layer', 'form', 'upload'], function () {
|
|||
// 上传线下培训记录附件
|
||||
var uploadcom1 = upload1.render({
|
||||
elem: '#ID-upload-demo-size1',
|
||||
url: filePath + "/file/upload", //改成您自己的上传接口
|
||||
url: IP_URL + "/file/file/upload", //改成您自己的上传接口
|
||||
multiple: true, //是否允许多文件上传,默认未false
|
||||
dataType: "json",
|
||||
exts: 'doc|docx|pdf|jpg|png|jpeg',
|
||||
|
|
@ -96,7 +96,7 @@ layui.use(['layer', 'form', 'upload'], function () {
|
|||
// 上传线下考试记录附件
|
||||
var uploadcom1 = upload2.render({
|
||||
elem: '#ID-upload-demo-size2',
|
||||
url: systemPath + "/user/upload", //改成您自己的上传接口
|
||||
url: IP_URL + "/system/user/upload", //改成您自己的上传接口
|
||||
multiple: true, //是否允许多文件上传,默认未false
|
||||
dataType: "json",
|
||||
exts: 'doc|docx|pdf|jpg|png|jpeg',
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ function uploadTrain() {
|
|||
//多图片上传
|
||||
var uploadcom = upload.render({
|
||||
elem: '#testTrain',
|
||||
url: filePath + "/file/upload", //改成您自己的上传接口
|
||||
url: IP_URL + "/file/file/upload", //改成您自己的上传接口
|
||||
multiple: true, //是否允许多文件上传,默认未false
|
||||
dataType: "json",
|
||||
exts: 'doc|docx|pdf|jpg|png|jpeg',
|
||||
|
|
@ -217,7 +217,7 @@ function uploadExam() {
|
|||
//多图片上传
|
||||
var uploadcom = upload.render({
|
||||
elem: '#testExam',
|
||||
url: filePath + "/file/upload", //改成您自己的上传接口
|
||||
url: IP_URL + "/file/file/upload", //改成您自己的上传接口
|
||||
multiple: true, //是否允许多文件上传,默认未false
|
||||
dataType: "json",
|
||||
exts: 'doc|docx|pdf|jpg|png|jpeg',
|
||||
|
|
|
|||
|
|
@ -166,7 +166,7 @@ function uploadTrain() {
|
|||
//多图片上传
|
||||
var uploadcom = upload.render({
|
||||
elem: '#testTrain',
|
||||
url: filePath + "/file/upload", //改成您自己的上传接口
|
||||
url: IP_URL + "/file/file/upload", //改成您自己的上传接口
|
||||
multiple: true, //是否允许多文件上传,默认未false
|
||||
dataType: "json",
|
||||
exts: 'doc|docx|pdf|jpg|png|jpeg',
|
||||
|
|
@ -240,7 +240,7 @@ function uploadExam() {
|
|||
//多图片上传
|
||||
var uploadcom = upload.render({
|
||||
elem: '#testExam',
|
||||
url: filePath + "/file/upload", //改成您自己的上传接口
|
||||
url: IP_URL + "/file/file/upload", //改成您自己的上传接口
|
||||
multiple: true, //是否允许多文件上传,默认未false
|
||||
dataType: "json",
|
||||
exts: 'doc|docx|pdf|jpg|png|jpeg',
|
||||
|
|
|
|||
|
|
@ -171,7 +171,7 @@ function uploadTrain() {
|
|||
//多图片上传
|
||||
var uploadcom = upload.render({
|
||||
elem: '#testTrain',
|
||||
url: filePath + "/file/upload", //改成您自己的上传接口
|
||||
url: IP_URL + "/file/file/upload", //改成您自己的上传接口
|
||||
multiple: true, //是否允许多文件上传,默认未false
|
||||
dataType: "json",
|
||||
exts: 'doc|docx|pdf|jpg|png|jpeg',
|
||||
|
|
@ -247,7 +247,7 @@ function uploadExam() {
|
|||
//多图片上传
|
||||
var uploadcom = upload.render({
|
||||
elem: '#testExam',
|
||||
url: filePath + "/file/upload", //改成您自己的上传接口
|
||||
url: IP_URL + "/file/file/upload", //改成您自己的上传接口
|
||||
multiple: true, //是否允许多文件上传,默认未false
|
||||
dataType: "json",
|
||||
exts: 'doc|docx|pdf|jpg|png|jpeg',
|
||||
|
|
|
|||
|
|
@ -301,14 +301,14 @@ function getSubjectDetailsFun() {
|
|||
<span class="score">
|
||||
</span><div>`
|
||||
for (var item of singleChoiceList[i].questionPhotoList) {
|
||||
subjectCardHtml +=`<img src="${filePath+"/"+item.photoPath}" width="60" height="60"/> `
|
||||
subjectCardHtml +=`<img src="${IP_URL+"/file/"+item.photoPath}" width="60" height="60"/> `
|
||||
}
|
||||
subjectCardHtml += `</div></div><ul>`;
|
||||
for (var key in singleChoiceList[i].listOption) {
|
||||
subjectCardHtml +=`<li>${optionIndex[key]}:${singleChoiceList[i].listOption ? (singleChoiceList[i].listOption[key]?.optionContent || '') : ''}</li>`
|
||||
subjectCardHtml += `<div>`
|
||||
for (var item of singleChoiceList[i].listOption[key].questionPhotoList) {
|
||||
subjectCardHtml +=`<img src="${filePath+"/"+item.photoPath}" width="60" height="60"/> `
|
||||
subjectCardHtml +=`<img src="${IP_URL+"/file/"+item.photoPath}" width="60" height="60"/> `
|
||||
}
|
||||
subjectCardHtml += `</div>`
|
||||
}
|
||||
|
|
@ -321,14 +321,14 @@ function getSubjectDetailsFun() {
|
|||
<span class="score">
|
||||
</span><div>`
|
||||
for (var item of multipleChoiceList[i].questionPhotoList) {
|
||||
subjectCardHtml +=`<img src="${filePath+"/"+item.photoPath}" width="60" height="60"/> `
|
||||
subjectCardHtml +=`<img src="${IP_URL+"/file/"+item.photoPath}" width="60" height="60"/> `
|
||||
}
|
||||
subjectCardHtml += `</div></div><ul>`;
|
||||
for (var key in multipleChoiceList[i].listOption) {
|
||||
subjectCardHtml +=`<li>${optionIndex[key]}:${multipleChoiceList[i].listOption ? (multipleChoiceList[i].listOption[key]?.optionContent || '') : ''}</li>`
|
||||
subjectCardHtml += `<div>`
|
||||
for (var item of multipleChoiceList[i].listOption[key].questionPhotoList) {
|
||||
subjectCardHtml +=`<img src="${filePath+"/"+item.photoPath}" width="60" height="60"/> `
|
||||
subjectCardHtml +=`<img src="${IP_URL+"/file/"+item.photoPath}" width="60" height="60"/> `
|
||||
}
|
||||
subjectCardHtml += `</div>`
|
||||
}
|
||||
|
|
@ -342,7 +342,7 @@ function getSubjectDetailsFun() {
|
|||
<span class="score">
|
||||
</span><div>`
|
||||
for (var item of judgeList[i].questionPhotoList) {
|
||||
subjectCardHtml +=`<img src="${filePath+"/"+item.photoPath}" width="60" height="60"/> `
|
||||
subjectCardHtml +=`<img src="${IP_URL+"/file/"+item.photoPath}" width="60" height="60"/> `
|
||||
}
|
||||
subjectCardHtml += `</div></div><ul>`;
|
||||
for (var key in judgeList[i].listOption) {
|
||||
|
|
|
|||
|
|
@ -613,7 +613,7 @@ function uploadFileSubject() {
|
|||
//多图片上传
|
||||
var uploadcom = upload.render({
|
||||
elem: '#test',
|
||||
url: systemPath + "/user/upload", //改成您自己的上传接口
|
||||
url: IP_URL + "/system/user/upload", //改成您自己的上传接口
|
||||
multiple: true, //是否允许多文件上传,默认未false
|
||||
dataType: "json",
|
||||
exts: 'jpg|png|jpeg',
|
||||
|
|
@ -735,7 +735,7 @@ function uploadFileOption(i) {
|
|||
//多图片上传
|
||||
var uploadcom = upload.render({
|
||||
elem: '#test' + i,
|
||||
url: systemPath + "/user/upload", //改成您自己的上传接口
|
||||
url: IP_URL + "/system/user/upload", //改成您自己的上传接口
|
||||
multiple: true, //是否允许多文件上传,默认未false
|
||||
dataType: "json",
|
||||
exts: 'jpg|png|jpeg',
|
||||
|
|
|
|||
|
|
@ -422,7 +422,7 @@ function uploadFileSubject() {
|
|||
//多图片上传
|
||||
var uploadcom = upload.render({
|
||||
elem: '#test',
|
||||
url: systemPath + "/user/upload", //改成您自己的上传接口
|
||||
url: IP_URL + "/system/user/upload", //改成您自己的上传接口
|
||||
multiple: true, //是否允许多文件上传,默认未false
|
||||
dataType: "json",
|
||||
exts: 'jpg|png|jpeg',
|
||||
|
|
@ -558,7 +558,7 @@ function uploadFileOption(i) {
|
|||
//多图片上传
|
||||
var uploadcom = upload.render({
|
||||
elem: '#test' + i,
|
||||
url: systemPath + "/user/upload", //改成您自己的上传接口
|
||||
url: IP_URL + "/system/user/upload", //改成您自己的上传接口
|
||||
multiple: true, //是否允许多文件上传,默认未false
|
||||
dataType: "json",
|
||||
exts: 'jpg|png|jpeg',
|
||||
|
|
|
|||
|
|
@ -216,7 +216,7 @@ function singleAnswerClick(questionId, ownAnswer, isRight, event) {
|
|||
$.ajax({
|
||||
type: 'POST',
|
||||
async: true, // 默认异步true,false表示同步
|
||||
url: systemPath + '/exam/uploadExamPaper',
|
||||
url: IP_URL + '/system/exam/uploadExamPaper',
|
||||
contentType: "application/json; charset=utf-8",
|
||||
dataType: 'json', // 服务器返回数据类型
|
||||
data: JSON.stringify(json), //获取提交的表单字段
|
||||
|
|
@ -281,7 +281,7 @@ function multipleAnswerSub(event) {
|
|||
$.ajax({
|
||||
type: 'POST',
|
||||
async: true, // 默认异步true,false表示同步
|
||||
url: systemPath + '/exam/uploadExamPaper',
|
||||
url: IP_URL + '/system/exam/uploadExamPaper',
|
||||
contentType: "application/json; charset=utf-8",
|
||||
dataType: 'json', // 服务器返回数据类型
|
||||
data: JSON.stringify(json), //获取提交的表单字段
|
||||
|
|
@ -314,7 +314,7 @@ function judgeAnswerClick(questionId, ownAnswer, isRight, event) {
|
|||
$.ajax({
|
||||
type: 'POST',
|
||||
async: true, // 默认异步true,false表示同步
|
||||
url: systemPath + '/exam/uploadExamPaper',
|
||||
url: IP_URL + '/system/exam/uploadExamPaper',
|
||||
contentType: "application/json; charset=utf-8",
|
||||
dataType: 'json', // 服务器返回数据类型
|
||||
data: JSON.stringify(json), //获取提交的表单字段
|
||||
|
|
@ -365,7 +365,7 @@ function sunPaper(data) {
|
|||
$.ajax({
|
||||
type: 'POST',
|
||||
async: true, // 默认异步true,false表示同步
|
||||
url: systemPath + '/exam/uploadCompleteExam',
|
||||
url: IP_URL + '/system/exam/uploadCompleteExam',
|
||||
contentType: "application/json; charset=utf-8",
|
||||
dataType: 'json', // 服务器返回数据类型
|
||||
data: JSON.stringify(data), //获取提交的表单字段
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ layui.use(['layer', 'form','element'], function () {
|
|||
$.ajax({
|
||||
type: 'POST',
|
||||
async: true, // 默认异步true,false表示同步
|
||||
url: systemPath + '/exam/selectExamPager',
|
||||
url: IP_URL + '/system/exam/selectExamPager',
|
||||
contentType: "application/json; charset=utf-8",
|
||||
dataType: 'json', // 服务器返回数据类型
|
||||
data: JSON.stringify(parentData), //获取提交的表单字段
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ function basicInformation() {
|
|||
$.ajax({
|
||||
type: 'POST',
|
||||
async: false, // 默认异步true,false表示同步
|
||||
url: systemPath + '/mergeTrainExam/selectPersonInfo',
|
||||
url: IP_URL + '/system/mergeTrainExam/selectPersonInfo',
|
||||
contentType: "application/json; charset=utf-8",
|
||||
dataType: 'json', // 服务器返回数据类型
|
||||
data: JSON.stringify({"idNumber": idNumber}), //获取提交的表单字段
|
||||
|
|
@ -211,7 +211,7 @@ function aqInit(foreignId, examType, type, trainEvent, examEvent) {
|
|||
$.ajax({
|
||||
type: 'POST',
|
||||
async: false, // 默认异步true,false表示同步
|
||||
url: systemPath + '/mergeTrainExam/selectTrainExamList',
|
||||
url: IP_URL + '/system/mergeTrainExam/selectTrainExamList',
|
||||
contentType: "application/json; charset=utf-8",
|
||||
dataType: 'json', // 服务器返回数据类型
|
||||
data: JSON.stringify(json), //获取提交的表单字段
|
||||
|
|
@ -449,7 +449,7 @@ function learnClick(filePath, fileType, id, trainProgress) {
|
|||
$.ajax({
|
||||
type: 'POST',
|
||||
async: false, // 默认异步true,false表示同步
|
||||
url: systemPath + '/train/uploadTrainData',
|
||||
url: IP_URL + '/system/train/uploadTrainData',
|
||||
contentType: "application/json; charset=utf-8",
|
||||
dataType: 'json', // 服务器返回数据类型
|
||||
data: JSON.stringify(json), //获取提交的表单字段
|
||||
|
|
@ -497,7 +497,7 @@ function learnClick(filePath, fileType, id, trainProgress) {
|
|||
$.ajax({
|
||||
type: 'POST',
|
||||
async: false, // 默认异步true,false表示同步
|
||||
url: systemPath + '/train/uploadTrainData',
|
||||
url: IP_URL + '/system/train/uploadTrainData',
|
||||
contentType: "application/json; charset=utf-8",
|
||||
dataType: 'json', // 服务器返回数据类型
|
||||
data: JSON.stringify(json), //获取提交的表单字段
|
||||
|
|
@ -581,7 +581,7 @@ function examDetialClick(examPaperId, completeId, examScore, examResult) {
|
|||
$.ajax({
|
||||
type: 'POST',
|
||||
async: true, // 默认异步true,false表示同步
|
||||
url: systemPath + '/exam/selectExamPagerById',
|
||||
url: IP_URL + '/system/exam/selectExamPagerById',
|
||||
contentType: "application/json; charset=utf-8",
|
||||
dataType: 'json', // 服务器返回数据类型
|
||||
data: JSON.stringify(json), //获取提交的表单字段
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ layui.use(['upload'], function () {
|
|||
var uploadListIns = upload.render({
|
||||
elem: '#ID-upload-demo-files',
|
||||
elemList: $('#ID-upload-demo-files-list'), // 列表元素对象
|
||||
url: filePath + "/file/upload", // 实际使用时改成您自己的上传接口即可。
|
||||
url: IP_URL + "/file/file/upload", // 实际使用时改成您自己的上传接口即可。
|
||||
multiple: true, //是否允许多文件上传,默认未false
|
||||
dataType: "json",
|
||||
accept: "file",
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ function init() {
|
|||
function getSubCompany() {
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getSubCompany',
|
||||
url: IP_URL + '/system/select/getSubCompany',
|
||||
async: false,
|
||||
success: function (data) {
|
||||
if (data.code == 200) {
|
||||
|
|
|
|||
|
|
@ -173,7 +173,7 @@ function dayPlanDetails(proName) {
|
|||
var index = parent.layer.open({
|
||||
title: ['日计划详情', 'color:#3B70A1;background-color:#E8ECEB;font-size:20px'],
|
||||
type: 2,
|
||||
content: planUrl+'/pages/work/home/newHomeForm.html?proName=' + proName + '&day=' + data,
|
||||
content: IP_URL+'/ynPlan/pages/work/home/newHomeForm.html?proName=' + proName + '&day=' + data,
|
||||
area: [width, height],
|
||||
maxmin: false,
|
||||
success: function (layero, index) {
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ function init(){
|
|||
function getSubCompany(){
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getSubCompanyNoAuth',
|
||||
url: IP_URL + '/system/select/getSubCompanyNoAuth',
|
||||
async: false,
|
||||
success: function (data) {
|
||||
if(data.code == 200){
|
||||
|
|
|
|||
|
|
@ -162,7 +162,7 @@ function getTeamByProId(proId,subId,teamId) {
|
|||
$("#teamId").empty();
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getTeamByProId',
|
||||
url: IP_URL + '/system/select/getTeamByProId',
|
||||
data: {
|
||||
proId: proId,
|
||||
subId: subId
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ layui.use(['form', 'table', 'upload', 'laydate'], function () {
|
|||
function uploadFile(){
|
||||
var uploadcom = upload.render({
|
||||
elem: '#test',
|
||||
url: filePath + "/file/upload", //改成您自己的上传接口
|
||||
url: IP_URL + "/file/file/upload", //改成您自己的上传接口
|
||||
multiple: true, //是否允许多文件上传,默认未false
|
||||
dataType: "json",
|
||||
// data: {"pickId": id},
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ layui.use(['form', 'table', 'upload', 'laydate'], function () {
|
|||
function uploadFile(){
|
||||
var uploadcom = upload.render({
|
||||
elem: '#test',
|
||||
url: filePath + "/file/upload", //改成您自己的上传接口
|
||||
url: IP_URL + "/file/file/upload", //改成您自己的上传接口
|
||||
multiple: true, //是否允许多文件上传,默认未false
|
||||
dataType: "json",
|
||||
// data: {"pickId": id},
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ layui.use(['form', 'table', 'upload', 'laydate'], function () {
|
|||
function uploadFile(){
|
||||
var uploadcom = upload.render({
|
||||
elem: '#test',
|
||||
url: filePath + "/file/upload", //改成您自己的上传接口
|
||||
url: IP_URL + "/file/file/upload", //改成您自己的上传接口
|
||||
multiple: true, //是否允许多文件上传,默认未false
|
||||
dataType: "json",
|
||||
// data: {"pickId": id},
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ layui.use(['form', 'table', 'upload', 'laydate'], function () {
|
|||
function uploadFile(){
|
||||
var uploadcom = upload.render({
|
||||
elem: '#test',
|
||||
url: systemPath + "/user/upload", //改成您自己的上传接口
|
||||
url: IP_URL + "/system/user/upload", //改成您自己的上传接口
|
||||
multiple: true, //是否允许多文件上传,默认未false
|
||||
dataType: "json",
|
||||
// data: {"pickId": id},
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ function setParams(json) {
|
|||
// 渲染
|
||||
var uploadcom1 = upload.render({
|
||||
elem: '#ID-upload-demo-size',
|
||||
url: filePath + "/file/upload", //改成您自己的上传接口
|
||||
url: IP_URL + "/file/file/upload", //改成您自己的上传接口
|
||||
multiple: true, //是否允许多文件上传,默认未false
|
||||
dataType: "json",
|
||||
exts: 'jpg|png|jpeg|pdf|docx|doc',
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@
|
|||
$.ajax({
|
||||
type : 'post',
|
||||
contentType : "application/json; charset=utf-8",
|
||||
url : loginPath + '/login',
|
||||
url : IP_URL + '/auth/login',
|
||||
data : JSON.stringify({
|
||||
// "username" : username,
|
||||
// "password" : password,
|
||||
|
|
@ -209,7 +209,7 @@
|
|||
time:5000
|
||||
});
|
||||
}
|
||||
var url = loginPath+"/getTokenKey?jwtToken="+jwtToken;
|
||||
var url = IP_URL+"/auth/getTokenKey?jwtToken="+jwtToken;
|
||||
$.ajax({
|
||||
type : "GET",
|
||||
contentType: "application/json;charset=UTF-8",
|
||||
|
|
|
|||
|
|
@ -337,7 +337,7 @@
|
|||
$("#companyId").html("");
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getCompany',
|
||||
url: IP_URL + '/system/select/getCompany',
|
||||
async: false,
|
||||
success: function (data) {
|
||||
if(data.code == 200){
|
||||
|
|
|
|||
|
|
@ -1394,7 +1394,7 @@ function titleStyle(){
|
|||
function getTeamBySubIdToData(subId,teamId) {
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getTeamBySubId',
|
||||
url: IP_URL + '/system/select/getTeamBySubId',
|
||||
data: {
|
||||
subId: subId
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1491,7 +1491,7 @@ function titleStyle(){
|
|||
function getTeamBySubIdToData(subId,teamId) {
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getTeamBySubId',
|
||||
url: IP_URL + '/system/select/getTeamBySubId',
|
||||
data: {
|
||||
subId: subId
|
||||
},
|
||||
|
|
|
|||
|
|
@ -358,7 +358,7 @@ function prevClick(e){
|
|||
function getTeamBySubIdToData(subId,teamId) {
|
||||
$.ajax({
|
||||
type: 'get',
|
||||
url: systemPath + '/select/getTeamBySubId',
|
||||
url: IP_URL + '/system/select/getTeamBySubId',
|
||||
data: {
|
||||
subId: subId
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
# Tomcat
|
||||
server:
|
||||
port: 1909
|
||||
servlet:
|
||||
context-path: /file
|
||||
# servlet:
|
||||
# context-path: /file
|
||||
|
||||
# Spring
|
||||
spring:
|
||||
|
|
@ -14,6 +14,8 @@ spring:
|
|||
active: @profiles.active@
|
||||
cloud:
|
||||
nacos:
|
||||
username: @nacos.username@
|
||||
password: @nacos.password@
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: @nacos.server@
|
||||
|
|
@ -26,4 +28,15 @@ spring:
|
|||
# 共享配置
|
||||
shared-configs:
|
||||
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
|
||||
namespace: @name.space@
|
||||
namespace: @name.space@
|
||||
management:
|
||||
server:
|
||||
port: -1
|
||||
endpoints:
|
||||
web:
|
||||
exposure:
|
||||
exclude: []
|
||||
enabled-by-default: false
|
||||
endpoint:
|
||||
beans:
|
||||
enabled: false
|
||||
|
|
@ -14,6 +14,8 @@ spring:
|
|||
active: @profiles.active@
|
||||
cloud:
|
||||
nacos:
|
||||
username: @nacos.username@
|
||||
password: @nacos.password@
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: @nacos.server@
|
||||
|
|
@ -40,4 +42,15 @@ logging:
|
|||
hibernate:
|
||||
type:
|
||||
descriptor:
|
||||
sql: trace
|
||||
sql: trace
|
||||
management:
|
||||
server:
|
||||
port: -1
|
||||
endpoints:
|
||||
web:
|
||||
exposure:
|
||||
exclude: []
|
||||
enabled-by-default: false
|
||||
endpoint:
|
||||
beans:
|
||||
enabled: false
|
||||
|
|
@ -14,6 +14,8 @@ spring:
|
|||
active: @profiles.active@
|
||||
cloud:
|
||||
nacos:
|
||||
username: @nacos.username@
|
||||
password: @nacos.password@
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: @nacos.server@
|
||||
|
|
@ -26,4 +28,16 @@ spring:
|
|||
# 共享配置
|
||||
shared-configs:
|
||||
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
|
||||
namespace: @name.space@
|
||||
namespace: @name.space@
|
||||
|
||||
management:
|
||||
server:
|
||||
port: -1
|
||||
endpoints:
|
||||
web:
|
||||
exposure:
|
||||
exclude: []
|
||||
enabled-by-default: false
|
||||
endpoint:
|
||||
beans:
|
||||
enabled: false
|
||||
|
|
@ -41,3 +41,17 @@ spring:
|
|||
shared-configs:
|
||||
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
|
||||
namespace: @name.space@
|
||||
|
||||
|
||||
|
||||
management:
|
||||
server:
|
||||
port: -1
|
||||
endpoints:
|
||||
web:
|
||||
exposure:
|
||||
exclude: []
|
||||
enabled-by-default: false
|
||||
endpoint:
|
||||
beans:
|
||||
enabled: false
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
package com.bonus.oiplan;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
|
||||
@SpringBootTest
|
||||
class OiPlanApplicationTests {
|
||||
|
||||
@Test
|
||||
void contextLoads() {
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -19,6 +19,8 @@ spring:
|
|||
nacos:
|
||||
enabled: true
|
||||
nacos:
|
||||
username: @nacos.username@
|
||||
password: @nacos.password@
|
||||
discovery:
|
||||
# 服务注册地址
|
||||
server-addr: @nacos.server@
|
||||
|
|
@ -32,3 +34,15 @@ spring:
|
|||
shared-configs:
|
||||
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
|
||||
namespace: @name.space@
|
||||
|
||||
management:
|
||||
server:
|
||||
port: -1
|
||||
endpoints:
|
||||
web:
|
||||
exposure:
|
||||
exclude: []
|
||||
enabled-by-default: false
|
||||
endpoint:
|
||||
beans:
|
||||
enabled: false
|
||||
|
|
|
|||
|
|
@ -26,4 +26,16 @@ spring:
|
|||
# 共享配置
|
||||
shared-configs:
|
||||
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
|
||||
namespace: @name.space@
|
||||
namespace: @name.space@
|
||||
|
||||
management:
|
||||
server:
|
||||
port: -1
|
||||
endpoints:
|
||||
web:
|
||||
exposure:
|
||||
exclude: []
|
||||
enabled-by-default: false
|
||||
endpoint:
|
||||
beans:
|
||||
enabled: false
|
||||
7
pom.xml
7
pom.xml
|
|
@ -366,9 +366,14 @@
|
|||
<properties>
|
||||
<profiles.active>test</profiles.active>
|
||||
<nacos.server>192.168.0.14:8848</nacos.server>
|
||||
<name.space>63a17c0c-7547-4801-9044-cd59abb71262</name.space>
|
||||
<nacos.username>nacos</nacos.username>
|
||||
<nacos.password>nacos</nacos.password>
|
||||
<name.space>yn_real_name</name.space>
|
||||
<version>dev_test</version>
|
||||
</properties>
|
||||
<activation>
|
||||
<activeByDefault>true</activeByDefault>
|
||||
</activation>
|
||||
</profile>
|
||||
|
||||
<!-- <profile>-->
|
||||
|
|
|
|||
Loading…
Reference in New Issue