diff --git a/auth/src/main/resources/bootstrap.yml b/auth/src/main/resources/bootstrap.yml index a843533..04f53fc 100644 --- a/auth/src/main/resources/bootstrap.yml +++ b/auth/src/main/resources/bootstrap.yml @@ -19,6 +19,8 @@ spring: nacos: enabled: true nacos: + username: @nacos.username@ + password: @nacos.password@ discovery: # 服务注册地址 server-addr: @nacos.server@ diff --git a/common/common-core/src/main/java/com/bonus/common/core/utils/JwtUtils.java b/common/common-core/src/main/java/com/bonus/common/core/utils/JwtUtils.java index e19405b..dd8e03d 100644 --- a/common/common-core/src/main/java/com/bonus/common/core/utils/JwtUtils.java +++ b/common/common-core/src/main/java/com/bonus/common/core/utils/JwtUtils.java @@ -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); } diff --git a/gateway/src/main/java/com/bonus/gateway/config/AuthWriteUtils.java b/gateway/src/main/java/com/bonus/gateway/config/AuthWriteUtils.java new file mode 100644 index 0000000..66d08d1 --- /dev/null +++ b/gateway/src/main/java/com/bonus/gateway/config/AuthWriteUtils.java @@ -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 getBlackUrl(){ + List whiteUrl=new ArrayList<>(); + whiteUrl.add("/bmw/**"); + return whiteUrl; + } + + +} diff --git a/gateway/src/main/java/com/bonus/gateway/config/CorsConfig.java b/gateway/src/main/java/com/bonus/gateway/config/CorsConfig.java new file mode 100644 index 0000000..2c55e3f --- /dev/null +++ b/gateway/src/main/java/com/bonus/gateway/config/CorsConfig.java @@ -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); + } +} \ No newline at end of file diff --git a/gateway/src/main/java/com/bonus/gateway/filter/AuthFilter.java b/gateway/src/main/java/com/bonus/gateway/filter/AuthFilter.java index f1027af..6863f14 100644 --- a/gateway/src/main/java/com/bonus/gateway/filter/AuthFilter.java +++ b/gateway/src/main/java/com/bonus/gateway/filter/AuthFilter.java @@ -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())) { diff --git a/gateway/src/main/resources/bootstrap.yml b/gateway/src/main/resources/bootstrap.yml index f711b45..2ccf5de 100644 --- a/gateway/src/main/resources/bootstrap.yml +++ b/gateway/src/main/resources/bootstrap.yml @@ -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 \ No newline at end of file diff --git a/modules/app/src/main/resources/bootstrap.yml b/modules/app/src/main/resources/bootstrap.yml index 0827899..b7657d1 100644 --- a/modules/app/src/main/resources/bootstrap.yml +++ b/modules/app/src/main/resources/bootstrap.yml @@ -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@ diff --git a/modules/app/src/test/java/com/bonus/app/pay/service/PayCardServiceImplTest.java b/modules/app/src/test/java/com/bonus/app/pay/service/PayCardServiceImplTest.java deleted file mode 100644 index 3d4297d..0000000 --- a/modules/app/src/test/java/com/bonus/app/pay/service/PayCardServiceImplTest.java +++ /dev/null @@ -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); - } -} \ No newline at end of file diff --git a/modules/app/src/test/java/com/bonus/app/pay/service/PayViewServiceImplTest.java b/modules/app/src/test/java/com/bonus/app/pay/service/PayViewServiceImplTest.java deleted file mode 100644 index 91941bf..0000000 --- a/modules/app/src/test/java/com/bonus/app/pay/service/PayViewServiceImplTest.java +++ /dev/null @@ -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); - } -} \ No newline at end of file diff --git a/modules/app/src/test/java/com/bonus/app/person/service/BasePersonServiceImplTest.java b/modules/app/src/test/java/com/bonus/app/person/service/BasePersonServiceImplTest.java deleted file mode 100644 index fd8df38..0000000 --- a/modules/app/src/test/java/com/bonus/app/person/service/BasePersonServiceImplTest.java +++ /dev/null @@ -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()); - } -} \ No newline at end of file diff --git a/modules/app/src/test/java/com/bonus/app/person/service/ContractWitnessServiceImplTest.java b/modules/app/src/test/java/com/bonus/app/person/service/ContractWitnessServiceImplTest.java deleted file mode 100644 index c7d20f6..0000000 --- a/modules/app/src/test/java/com/bonus/app/person/service/ContractWitnessServiceImplTest.java +++ /dev/null @@ -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"); - } -} \ No newline at end of file diff --git a/modules/app/src/test/java/com/bonus/app/person/service/FaceContrastServiceImplTest.java b/modules/app/src/test/java/com/bonus/app/person/service/FaceContrastServiceImplTest.java deleted file mode 100644 index 3c66308..0000000 --- a/modules/app/src/test/java/com/bonus/app/person/service/FaceContrastServiceImplTest.java +++ /dev/null @@ -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 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 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"); - } -} \ No newline at end of file diff --git a/modules/app/src/test/java/com/bonus/app/person/service/SafeguardingInfoServiceImplTest.java b/modules/app/src/test/java/com/bonus/app/person/service/SafeguardingInfoServiceImplTest.java deleted file mode 100644 index accb971..0000000 --- a/modules/app/src/test/java/com/bonus/app/person/service/SafeguardingInfoServiceImplTest.java +++ /dev/null @@ -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"); - } -} \ No newline at end of file diff --git a/modules/app/src/test/java/com/bonus/app/person/service/TrainVideoServiceImplTest.java b/modules/app/src/test/java/com/bonus/app/person/service/TrainVideoServiceImplTest.java deleted file mode 100644 index 6a29c7d..0000000 --- a/modules/app/src/test/java/com/bonus/app/person/service/TrainVideoServiceImplTest.java +++ /dev/null @@ -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 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); - } - -} \ No newline at end of file diff --git a/modules/app/src/test/java/com/bonus/app/person/service/UploadCertificateServiceImplTest.java b/modules/app/src/test/java/com/bonus/app/person/service/UploadCertificateServiceImplTest.java deleted file mode 100644 index 00dea0b..0000000 --- a/modules/app/src/test/java/com/bonus/app/person/service/UploadCertificateServiceImplTest.java +++ /dev/null @@ -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); - } -} \ No newline at end of file diff --git a/modules/bmw/src/main/resources/bootstrap.yml b/modules/bmw/src/main/resources/bootstrap.yml index bb45389..9f83cef 100644 --- a/modules/bmw/src/main/resources/bootstrap.yml +++ b/modules/bmw/src/main/resources/bootstrap.yml @@ -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 diff --git a/modules/bmw/src/main/resources/static/js/dict.js b/modules/bmw/src/main/resources/static/js/dict.js index 0bf3043..9a9c00e 100644 --- a/modules/bmw/src/main/resources/static/js/dict.js +++ b/modules/bmw/src/main/resources/static/js/dict.js @@ -45,7 +45,7 @@ function getDict(type) { let v = {}; $.ajax({ type : 'post', - url : systemPath + '/dicts', + url : IP_URL + '/system/dicts', data : { "type" : type }, diff --git a/modules/bmw/src/main/resources/static/js/jq.js b/modules/bmw/src/main/resources/static/js/jq.js index 4633c7b..e5c149b 100644 --- a/modules/bmw/src/main/resources/static/js/jq.js +++ b/modules/bmw/src/main/resources/static/js/jq.js @@ -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('未授权'); diff --git a/modules/bmw/src/main/resources/static/js/main.js b/modules/bmw/src/main/resources/static/js/main.js index 3053712..707b505 100644 --- a/modules/bmw/src/main/resources/static/js/main.js +++ b/modules/bmw/src/main/resources/static/js/main.js @@ -125,7 +125,7 @@ function logout() { $.ajax({ type: 'delete', - url: loginPath + '/logout', + url: IP_URL + '/auth/logout', headers: { "Authorization": token }, diff --git a/modules/bmw/src/main/resources/static/js/publicJs.js b/modules/bmw/src/main/resources/static/js/publicJs.js index 684df03..9ccff88 100644 --- a/modules/bmw/src/main/resources/static/js/publicJs.js +++ b/modules/bmw/src/main/resources/static/js/publicJs.js @@ -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 //正式环境 diff --git a/modules/bmw/src/main/resources/static/js/select.js b/modules/bmw/src/main/resources/static/js/select.js index cf68405..aa58863 100644 --- a/modules/bmw/src/main/resources/static/js/select.js +++ b/modules/bmw/src/main/resources/static/js/select.js @@ -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) { diff --git a/modules/bmw/src/main/resources/static/js/work/Person/personEntry/personEntryFrom.js b/modules/bmw/src/main/resources/static/js/work/Person/personEntry/personEntryFrom.js index 7b15fab..61eff3a 100644 --- a/modules/bmw/src/main/resources/static/js/work/Person/personEntry/personEntryFrom.js +++ b/modules/bmw/src/main/resources/static/js/work/Person/personEntry/personEntryFrom.js @@ -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 }, diff --git a/modules/bmw/src/main/resources/static/js/work/Person/personEntry/personEntryUpd.js b/modules/bmw/src/main/resources/static/js/work/Person/personEntry/personEntryUpd.js index 7fc97c8..fc052c0 100644 --- a/modules/bmw/src/main/resources/static/js/work/Person/personEntry/personEntryUpd.js +++ b/modules/bmw/src/main/resources/static/js/work/Person/personEntry/personEntryUpd.js @@ -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 }, diff --git a/modules/bmw/src/main/resources/static/js/work/Person/personEntry/personEntryView.js b/modules/bmw/src/main/resources/static/js/work/Person/personEntry/personEntryView.js index 24c01c5..e4e04dd 100644 --- a/modules/bmw/src/main/resources/static/js/work/Person/personEntry/personEntryView.js +++ b/modules/bmw/src/main/resources/static/js/work/Person/personEntry/personEntryView.js @@ -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 }, diff --git a/modules/bmw/src/main/resources/static/js/work/ProduceRiskPlan/child/produceWeekPlanBranchCompanyUser.js b/modules/bmw/src/main/resources/static/js/work/ProduceRiskPlan/child/produceWeekPlanBranchCompanyUser.js index 4bab11a..8fc89a1 100644 --- a/modules/bmw/src/main/resources/static/js/work/ProduceRiskPlan/child/produceWeekPlanBranchCompanyUser.js +++ b/modules/bmw/src/main/resources/static/js/work/ProduceRiskPlan/child/produceWeekPlanBranchCompanyUser.js @@ -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) { diff --git a/modules/bmw/src/main/resources/static/js/work/ProduceRiskPlan/child/produceWeekPlanCompanyUser.js b/modules/bmw/src/main/resources/static/js/work/ProduceRiskPlan/child/produceWeekPlanCompanyUser.js index 0846ac8..23dc4a3 100644 --- a/modules/bmw/src/main/resources/static/js/work/ProduceRiskPlan/child/produceWeekPlanCompanyUser.js +++ b/modules/bmw/src/main/resources/static/js/work/ProduceRiskPlan/child/produceWeekPlanCompanyUser.js @@ -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' diff --git a/modules/bmw/src/main/resources/static/js/work/ProduceRiskPlan/child/produceWeekPlanUploadDetails.js b/modules/bmw/src/main/resources/static/js/work/ProduceRiskPlan/child/produceWeekPlanUploadDetails.js index 3e5c1b6..3878b28 100644 --- a/modules/bmw/src/main/resources/static/js/work/ProduceRiskPlan/child/produceWeekPlanUploadDetails.js +++ b/modules/bmw/src/main/resources/static/js/work/ProduceRiskPlan/child/produceWeekPlanUploadDetails.js @@ -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 diff --git a/modules/bmw/src/main/resources/static/js/work/ProduceRiskPlan/child/produceWeekPlanUploadTransferAdd.js b/modules/bmw/src/main/resources/static/js/work/ProduceRiskPlan/child/produceWeekPlanUploadTransferAdd.js index e3cec72..de2b479 100644 --- a/modules/bmw/src/main/resources/static/js/work/ProduceRiskPlan/child/produceWeekPlanUploadTransferAdd.js +++ b/modules/bmw/src/main/resources/static/js/work/ProduceRiskPlan/child/produceWeekPlanUploadTransferAdd.js @@ -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 diff --git a/modules/bmw/src/main/resources/static/js/work/ProduceRiskPlan/child/produceWeekPlanUploadTransferUpd.js b/modules/bmw/src/main/resources/static/js/work/ProduceRiskPlan/child/produceWeekPlanUploadTransferUpd.js index d6341fd..34cfa0c 100644 --- a/modules/bmw/src/main/resources/static/js/work/ProduceRiskPlan/child/produceWeekPlanUploadTransferUpd.js +++ b/modules/bmw/src/main/resources/static/js/work/ProduceRiskPlan/child/produceWeekPlanUploadTransferUpd.js @@ -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 diff --git a/modules/bmw/src/main/resources/static/js/work/ProjectManage/commProblemForm.js b/modules/bmw/src/main/resources/static/js/work/ProjectManage/commProblemForm.js index 17a4440..680d25e 100644 --- a/modules/bmw/src/main/resources/static/js/work/ProjectManage/commProblemForm.js +++ b/modules/bmw/src/main/resources/static/js/work/ProjectManage/commProblemForm.js @@ -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'); } diff --git a/modules/bmw/src/main/resources/static/js/work/RiskPlan/child/weekPlanBranchCompanyUser.js b/modules/bmw/src/main/resources/static/js/work/RiskPlan/child/weekPlanBranchCompanyUser.js index 4bab11a..8fc89a1 100644 --- a/modules/bmw/src/main/resources/static/js/work/RiskPlan/child/weekPlanBranchCompanyUser.js +++ b/modules/bmw/src/main/resources/static/js/work/RiskPlan/child/weekPlanBranchCompanyUser.js @@ -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) { diff --git a/modules/bmw/src/main/resources/static/js/work/RiskPlan/child/weekPlanCompanyUser.js b/modules/bmw/src/main/resources/static/js/work/RiskPlan/child/weekPlanCompanyUser.js index 766da47..5f5e12e 100644 --- a/modules/bmw/src/main/resources/static/js/work/RiskPlan/child/weekPlanCompanyUser.js +++ b/modules/bmw/src/main/resources/static/js/work/RiskPlan/child/weekPlanCompanyUser.js @@ -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' diff --git a/modules/bmw/src/main/resources/static/js/work/RiskPlan/child/weekPlanUploadTransferUpd.js b/modules/bmw/src/main/resources/static/js/work/RiskPlan/child/weekPlanUploadTransferUpd.js index b694847..48bb531 100644 --- a/modules/bmw/src/main/resources/static/js/work/RiskPlan/child/weekPlanUploadTransferUpd.js +++ b/modules/bmw/src/main/resources/static/js/work/RiskPlan/child/weekPlanUploadTransferUpd.js @@ -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 diff --git a/modules/bmw/src/main/resources/static/js/work/SalaryStat/temporaryChild/upload.js b/modules/bmw/src/main/resources/static/js/work/SalaryStat/temporaryChild/upload.js index 75ac660..fdd806d 100644 --- a/modules/bmw/src/main/resources/static/js/work/SalaryStat/temporaryChild/upload.js +++ b/modules/bmw/src/main/resources/static/js/work/SalaryStat/temporaryChild/upload.js @@ -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', diff --git a/modules/bmw/src/main/resources/static/js/work/SettingManage/OperateLog/SysOperateLog.js b/modules/bmw/src/main/resources/static/js/work/SettingManage/OperateLog/SysOperateLog.js index 73cddce..2e93044 100644 --- a/modules/bmw/src/main/resources/static/js/work/SettingManage/OperateLog/SysOperateLog.js +++ b/modules/bmw/src/main/resources/static/js/work/SettingManage/OperateLog/SysOperateLog.js @@ -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(); diff --git a/modules/bmw/src/main/resources/static/js/work/SettingManage/UserManage/UserForm.js b/modules/bmw/src/main/resources/static/js/work/SettingManage/UserManage/UserForm.js index 523ec92..a8551a9 100644 --- a/modules/bmw/src/main/resources/static/js/work/SettingManage/UserManage/UserForm.js +++ b/modules/bmw/src/main/resources/static/js/work/SettingManage/UserManage/UserForm.js @@ -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 }, diff --git a/modules/bmw/src/main/resources/static/js/work/SubContractor/SubContract/SubContractFrom.js b/modules/bmw/src/main/resources/static/js/work/SubContractor/SubContract/SubContractFrom.js index 1b9e600..3c07843 100644 --- a/modules/bmw/src/main/resources/static/js/work/SubContractor/SubContract/SubContractFrom.js +++ b/modules/bmw/src/main/resources/static/js/work/SubContractor/SubContract/SubContractFrom.js @@ -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) { diff --git a/modules/bmw/src/main/resources/static/js/work/exam/offline/child/offlineResUpload.js b/modules/bmw/src/main/resources/static/js/work/exam/offline/child/offlineResUpload.js index 88fda5a..ef1f98b 100644 --- a/modules/bmw/src/main/resources/static/js/work/exam/offline/child/offlineResUpload.js +++ b/modules/bmw/src/main/resources/static/js/work/exam/offline/child/offlineResUpload.js @@ -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', diff --git a/modules/bmw/src/main/resources/static/js/work/exam/offline/child/practiceResUpdate.js b/modules/bmw/src/main/resources/static/js/work/exam/offline/child/practiceResUpdate.js index 4522bcc..08d88b3 100644 --- a/modules/bmw/src/main/resources/static/js/work/exam/offline/child/practiceResUpdate.js +++ b/modules/bmw/src/main/resources/static/js/work/exam/offline/child/practiceResUpdate.js @@ -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', diff --git a/modules/bmw/src/main/resources/static/js/work/exam/offline/child/practiceResUpload.js b/modules/bmw/src/main/resources/static/js/work/exam/offline/child/practiceResUpload.js index 0a8a686..7d8e9c5 100644 --- a/modules/bmw/src/main/resources/static/js/work/exam/offline/child/practiceResUpload.js +++ b/modules/bmw/src/main/resources/static/js/work/exam/offline/child/practiceResUpload.js @@ -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', diff --git a/modules/bmw/src/main/resources/static/js/work/exam/offline/child/update.js b/modules/bmw/src/main/resources/static/js/work/exam/offline/child/update.js index 6a3fc5e..5735ad6 100644 --- a/modules/bmw/src/main/resources/static/js/work/exam/offline/child/update.js +++ b/modules/bmw/src/main/resources/static/js/work/exam/offline/child/update.js @@ -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', diff --git a/modules/bmw/src/main/resources/static/js/work/exam/paperBank/fixedPaper2.js b/modules/bmw/src/main/resources/static/js/work/exam/paperBank/fixedPaper2.js index 0d6039a..ca6f8fd 100644 --- a/modules/bmw/src/main/resources/static/js/work/exam/paperBank/fixedPaper2.js +++ b/modules/bmw/src/main/resources/static/js/work/exam/paperBank/fixedPaper2.js @@ -301,14 +301,14 @@ function getSubjectDetailsFun() {
` for (var item of singleChoiceList[i].questionPhotoList) { - subjectCardHtml +=`  ` + subjectCardHtml +=`  ` } subjectCardHtml += `
    `; for (var key in singleChoiceList[i].listOption) { subjectCardHtml +=`
  • ${optionIndex[key]}:${singleChoiceList[i].listOption ? (singleChoiceList[i].listOption[key]?.optionContent || '') : ''}
    • ` subjectCardHtml += `
    ` for (var item of singleChoiceList[i].listOption[key].questionPhotoList) { - subjectCardHtml +=`  ` + subjectCardHtml +=`  ` } subjectCardHtml += `
    ` } @@ -321,14 +321,14 @@ function getSubjectDetailsFun() {
    ` for (var item of multipleChoiceList[i].questionPhotoList) { - subjectCardHtml +=`  ` + subjectCardHtml +=`  ` } subjectCardHtml += `
      `; for (var key in multipleChoiceList[i].listOption) { subjectCardHtml +=`
    • ${optionIndex[key]}:${multipleChoiceList[i].listOption ? (multipleChoiceList[i].listOption[key]?.optionContent || '') : ''}
      • ` subjectCardHtml += `
      ` for (var item of multipleChoiceList[i].listOption[key].questionPhotoList) { - subjectCardHtml +=`  ` + subjectCardHtml +=`  ` } subjectCardHtml += `
      ` } @@ -342,7 +342,7 @@ function getSubjectDetailsFun() {
      ` for (var item of judgeList[i].questionPhotoList) { - subjectCardHtml +=`  ` + subjectCardHtml +=`  ` } subjectCardHtml += `
        `; for (var key in judgeList[i].listOption) { diff --git a/modules/bmw/src/main/resources/static/js/work/exam/questionBank/child/addQuestion.js b/modules/bmw/src/main/resources/static/js/work/exam/questionBank/child/addQuestion.js index fb8a406..8058ee5 100644 --- a/modules/bmw/src/main/resources/static/js/work/exam/questionBank/child/addQuestion.js +++ b/modules/bmw/src/main/resources/static/js/work/exam/questionBank/child/addQuestion.js @@ -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', diff --git a/modules/bmw/src/main/resources/static/js/work/exam/questionBank/child/updQuestion.js b/modules/bmw/src/main/resources/static/js/work/exam/questionBank/child/updQuestion.js index 902b029..454c5e3 100644 --- a/modules/bmw/src/main/resources/static/js/work/exam/questionBank/child/updQuestion.js +++ b/modules/bmw/src/main/resources/static/js/work/exam/questionBank/child/updQuestion.js @@ -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', diff --git a/modules/bmw/src/main/resources/static/js/work/exam/studentEnd/examContent.js b/modules/bmw/src/main/resources/static/js/work/exam/studentEnd/examContent.js index bdeb674..68b2050 100644 --- a/modules/bmw/src/main/resources/static/js/work/exam/studentEnd/examContent.js +++ b/modules/bmw/src/main/resources/static/js/work/exam/studentEnd/examContent.js @@ -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), //获取提交的表单字段 diff --git a/modules/bmw/src/main/resources/static/js/work/exam/studentEnd/examPrompt.js b/modules/bmw/src/main/resources/static/js/work/exam/studentEnd/examPrompt.js index f0a0a45..605eec5 100644 --- a/modules/bmw/src/main/resources/static/js/work/exam/studentEnd/examPrompt.js +++ b/modules/bmw/src/main/resources/static/js/work/exam/studentEnd/examPrompt.js @@ -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), //获取提交的表单字段 diff --git a/modules/bmw/src/main/resources/static/js/work/exam/studentEnd/trainExamCenter.js b/modules/bmw/src/main/resources/static/js/work/exam/studentEnd/trainExamCenter.js index b03c55b..fbc1943 100644 --- a/modules/bmw/src/main/resources/static/js/work/exam/studentEnd/trainExamCenter.js +++ b/modules/bmw/src/main/resources/static/js/work/exam/studentEnd/trainExamCenter.js @@ -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), //获取提交的表单字段 diff --git a/modules/bmw/src/main/resources/static/js/work/exam/trainBank/child/upload.js b/modules/bmw/src/main/resources/static/js/work/exam/trainBank/child/upload.js index 4349251..6091a7b 100644 --- a/modules/bmw/src/main/resources/static/js/work/exam/trainBank/child/upload.js +++ b/modules/bmw/src/main/resources/static/js/work/exam/trainBank/child/upload.js @@ -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", diff --git a/modules/bmw/src/main/resources/static/js/work/exam/trainIndex.js b/modules/bmw/src/main/resources/static/js/work/exam/trainIndex.js index 8f72ec0..8f82336 100644 --- a/modules/bmw/src/main/resources/static/js/work/exam/trainIndex.js +++ b/modules/bmw/src/main/resources/static/js/work/exam/trainIndex.js @@ -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) { diff --git a/modules/bmw/src/main/resources/static/js/work/indexScreen/child/dayPlanList.js b/modules/bmw/src/main/resources/static/js/work/indexScreen/child/dayPlanList.js index 10d5c12..8d35509 100644 --- a/modules/bmw/src/main/resources/static/js/work/indexScreen/child/dayPlanList.js +++ b/modules/bmw/src/main/resources/static/js/work/indexScreen/child/dayPlanList.js @@ -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) { diff --git a/modules/bmw/src/main/resources/static/js/work/indexScreen/indexScreen.js b/modules/bmw/src/main/resources/static/js/work/indexScreen/indexScreen.js index 185f74b..826b2d8 100644 --- a/modules/bmw/src/main/resources/static/js/work/indexScreen/indexScreen.js +++ b/modules/bmw/src/main/resources/static/js/work/indexScreen/indexScreen.js @@ -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){ diff --git a/modules/bmw/src/main/resources/static/js/work/team/noSignalTeam/noSignalTeamSetUpFrom.js b/modules/bmw/src/main/resources/static/js/work/team/noSignalTeam/noSignalTeamSetUpFrom.js index 5a11ec2..9f9d55c 100644 --- a/modules/bmw/src/main/resources/static/js/work/team/noSignalTeam/noSignalTeamSetUpFrom.js +++ b/modules/bmw/src/main/resources/static/js/work/team/noSignalTeam/noSignalTeamSetUpFrom.js @@ -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 diff --git a/modules/bmw/src/main/resources/static/js/work/whiteBlackList/blackList/supplyChainBlackAdd.js b/modules/bmw/src/main/resources/static/js/work/whiteBlackList/blackList/supplyChainBlackAdd.js index 729ee5e..57e322c 100644 --- a/modules/bmw/src/main/resources/static/js/work/whiteBlackList/blackList/supplyChainBlackAdd.js +++ b/modules/bmw/src/main/resources/static/js/work/whiteBlackList/blackList/supplyChainBlackAdd.js @@ -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}, diff --git a/modules/bmw/src/main/resources/static/js/work/whiteBlackList/blackList/supplyChainBlackRelieve.js b/modules/bmw/src/main/resources/static/js/work/whiteBlackList/blackList/supplyChainBlackRelieve.js index 301723d..a095aec 100644 --- a/modules/bmw/src/main/resources/static/js/work/whiteBlackList/blackList/supplyChainBlackRelieve.js +++ b/modules/bmw/src/main/resources/static/js/work/whiteBlackList/blackList/supplyChainBlackRelieve.js @@ -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}, diff --git a/modules/bmw/src/main/resources/static/js/work/whiteBlackList/blackList/violationBlackAdd.js b/modules/bmw/src/main/resources/static/js/work/whiteBlackList/blackList/violationBlackAdd.js index 83462e0..98a879e 100644 --- a/modules/bmw/src/main/resources/static/js/work/whiteBlackList/blackList/violationBlackAdd.js +++ b/modules/bmw/src/main/resources/static/js/work/whiteBlackList/blackList/violationBlackAdd.js @@ -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}, diff --git a/modules/bmw/src/main/resources/static/js/work/whiteBlackList/blackList/violationBlackRelieve.js b/modules/bmw/src/main/resources/static/js/work/whiteBlackList/blackList/violationBlackRelieve.js index 5900fad..75f13d8 100644 --- a/modules/bmw/src/main/resources/static/js/work/whiteBlackList/blackList/violationBlackRelieve.js +++ b/modules/bmw/src/main/resources/static/js/work/whiteBlackList/blackList/violationBlackRelieve.js @@ -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}, diff --git a/modules/bmw/src/main/resources/static/js/work/whiteBlackList/blackList/violationBlackUpload.js b/modules/bmw/src/main/resources/static/js/work/whiteBlackList/blackList/violationBlackUpload.js index 66cdb28..8e1194d 100644 --- a/modules/bmw/src/main/resources/static/js/work/whiteBlackList/blackList/violationBlackUpload.js +++ b/modules/bmw/src/main/resources/static/js/work/whiteBlackList/blackList/violationBlackUpload.js @@ -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', diff --git a/modules/bmw/src/main/resources/static/login.html b/modules/bmw/src/main/resources/static/login.html index 1063385..3e36fa4 100644 --- a/modules/bmw/src/main/resources/static/login.html +++ b/modules/bmw/src/main/resources/static/login.html @@ -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", diff --git a/modules/bmw/src/main/resources/static/pages/role/addRole.html b/modules/bmw/src/main/resources/static/pages/role/addRole.html index 270a400..cb997f2 100644 --- a/modules/bmw/src/main/resources/static/pages/role/addRole.html +++ b/modules/bmw/src/main/resources/static/pages/role/addRole.html @@ -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){ diff --git a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.js b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.js index db69de4..f77f294 100644 --- a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.js +++ b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryFrom.js @@ -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 }, diff --git a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.js b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.js index 675fa9a..68115e1 100644 --- a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.js +++ b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryUpd.js @@ -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 }, diff --git a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.js b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.js index d1cc928..3a2ef67 100644 --- a/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.js +++ b/modules/bmw/src/main/resources/static/pages/work/Person/AttendanceMachine/personEntryView.js @@ -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 }, diff --git a/modules/file/src/main/resources/bootstrap.yml b/modules/file/src/main/resources/bootstrap.yml index d439132..c39780b 100644 --- a/modules/file/src/main/resources/bootstrap.yml +++ b/modules/file/src/main/resources/bootstrap.yml @@ -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@ \ No newline at end of file + namespace: @name.space@ +management: + server: + port: -1 + endpoints: + web: + exposure: + exclude: [] + enabled-by-default: false + endpoint: + beans: + enabled: false \ No newline at end of file diff --git a/modules/lineProtector/src/main/resources/bootstrap.yml b/modules/lineProtector/src/main/resources/bootstrap.yml index 71f2ba3..ce0e3eb 100644 --- a/modules/lineProtector/src/main/resources/bootstrap.yml +++ b/modules/lineProtector/src/main/resources/bootstrap.yml @@ -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 \ No newline at end of file + sql: trace +management: + server: + port: -1 + endpoints: + web: + exposure: + exclude: [] + enabled-by-default: false + endpoint: + beans: + enabled: false \ No newline at end of file diff --git a/modules/mw/src/main/resources/bootstrap.yml b/modules/mw/src/main/resources/bootstrap.yml index 3a7976b..ab13e4e 100644 --- a/modules/mw/src/main/resources/bootstrap.yml +++ b/modules/mw/src/main/resources/bootstrap.yml @@ -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@ \ No newline at end of file + namespace: @name.space@ + +management: + server: + port: -1 + endpoints: + web: + exposure: + exclude: [] + enabled-by-default: false + endpoint: + beans: + enabled: false \ No newline at end of file diff --git a/modules/oiPlan/src/main/resources/bootstrap.yml b/modules/oiPlan/src/main/resources/bootstrap.yml index 10cb406..4cdb00c 100644 --- a/modules/oiPlan/src/main/resources/bootstrap.yml +++ b/modules/oiPlan/src/main/resources/bootstrap.yml @@ -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 diff --git a/modules/oiPlan/src/test/java/com/bonus/oiplan/OiPlanApplicationTests.java b/modules/oiPlan/src/test/java/com/bonus/oiplan/OiPlanApplicationTests.java deleted file mode 100644 index d6dd816..0000000 --- a/modules/oiPlan/src/test/java/com/bonus/oiplan/OiPlanApplicationTests.java +++ /dev/null @@ -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() { - } - -} diff --git a/modules/system/src/main/resources/bootstrap.yml b/modules/system/src/main/resources/bootstrap.yml index 79ef0a7..18120a4 100644 --- a/modules/system/src/main/resources/bootstrap.yml +++ b/modules/system/src/main/resources/bootstrap.yml @@ -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 diff --git a/modules/wechat/src/main/resources/bootstrap.yml b/modules/wechat/src/main/resources/bootstrap.yml index badae9b..8f6a1c8 100644 --- a/modules/wechat/src/main/resources/bootstrap.yml +++ b/modules/wechat/src/main/resources/bootstrap.yml @@ -26,4 +26,16 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - namespace: @name.space@ \ No newline at end of file + namespace: @name.space@ + +management: + server: + port: -1 + endpoints: + web: + exposure: + exclude: [] + enabled-by-default: false + endpoint: + beans: + enabled: false \ No newline at end of file diff --git a/pom.xml b/pom.xml index f4f3b1a..5a8320f 100644 --- a/pom.xml +++ b/pom.xml @@ -366,9 +366,14 @@ test 192.168.0.14:8848 - 63a17c0c-7547-4801-9044-cd59abb71262 + nacos + nacos + yn_real_name dev_test + + true +