liwenxuan
/
lowcode
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

新云服务器配置 

Signed-off-by: liwenxuan <1298531568@qq.com>
master
liwenxuan 1 month ago
parent
a2e13415d1
commit
ac3854d6fc
5 changed files with 29 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      src/main/java/com/hxgk/lowcode/controller/ManContController.java
  2. 12
      src/main/java/com/hxgk/lowcode/service/impl/HrServiceImpl.java
  3. 8
      src/main/resources/application-dev.yml
  4. 15
      src/main/resources/application-prod.yml
  5. 4
      src/main/resources/application.yml

13
src/main/java/com/hxgk/lowcode/controller/ManContController.java
View File

@ -53,9 +53,16 @@ public class ManContController {
if(null!=manCont){
if(null!=manCont.getEmpType() && manCont.getEmpType()<9){
//查出该员工的所有父级部门
List<String> parentOrgs = userService.getAllParentOrgForEmp(manCont);
return JsonData.buildSuccess(parentOrgs);
//return JsonData.buildError("当前deviceNo没有绑定员工,可以xxl-job手动同步一下试试");
/*if(manCont.getCompany().equals("224")){
List<String> parentOrgs = new ArrayList<>();
parentOrgs.add("224");
return JsonData.buildSuccess(parentOrgs);
}else{*/
List<String> parentOrgs = userService.getAllParentOrgForEmp(manCont);
return JsonData.buildSuccess(parentOrgs);
//return JsonData.buildError("当前deviceNo没有绑定员工,可以xxl-job手动同步一下试试");
/*}*/
}else{
return JsonData.buildError("当前deviceNo绑定的员工不在职");
}

12
src/main/java/com/hxgk/lowcode/service/impl/HrServiceImpl.java
View File

@ -100,16 +100,16 @@ public class HrServiceImpl implements HrService {
public Tree getOrgAndManTree() {
//先从redis里查一下看看有没有有则直接返回
if(redisTemplate.hasKey("orgTree_313_309")){
String orgTreeStr = redisTemplate.opsForValue().get("orgTree_313_309").toString();
if(redisTemplate.hasKey("orgTree_0_313")){
String orgTreeStr = redisTemplate.opsForValue().get("orgTree_0_313").toString();
Tree o = JSON.parseObject(orgTreeStr, Tree.class);
return o;
}else{
ArrayList<OrgContType> allWsList = new ArrayList();
ArrayList<Tree> treeList = new ArrayList();
//Long adminorg = 0L;//恒信集团
Long adminorg = 0L;//恒信集团
//Long adminorg = 309L;//高科企管部
Long adminorg = 313L;//高科
//Long adminorg = 313L;//高科
OrgContType orgContType = queryOrgContTypeByAdminorg(adminorg);
findAllUnder(orgContType,allWsList);
@ -139,12 +139,12 @@ public class HrServiceImpl implements HrService {
recursionListToTree(treeList,pid);
}
for (Tree dept : treeList) {
if(dept.getId().equals("309")){//309高科 102企管 313集团
if(dept.getId().equals("313")){//309高科 102企管 313集团
tree = dept;
}
}
String orgAndManTree_Json= JSON.toJSONString(tree);
redisTemplate.opsForValue().set("orgTree_313_309", orgAndManTree_Json, 1, TimeUnit.DAYS);
redisTemplate.opsForValue().set("orgTree_0_313", orgAndManTree_Json, 1, TimeUnit.DAYS);
return tree;
}

8
src/main/resources/application-dev.yml
View File

@ -2,7 +2,7 @@
mybatis:
configuration:
#开启控制台打印sql
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
#log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
# mybatis 下划线转驼峰配置,两者都可以
map-underscore-to-camel-case: true
#配置扫描
@ -19,10 +19,10 @@ spring:
datasource:
hrnew:
driver-class-name: com.mysql.cj.jdbc.Driver
password: 9z_Bu28r1*DZ3K6@+a
password: AnknKiXiXaxNrw78
#url: jdbc:mysql://127.0.0.1:3306/hengxingaoke_tes?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
url: jdbc:mysql://172.20.5.33:4000/hr_new?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
username: root
url: jdbc:mysql://172.20.2.87:3306/hr_new?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
username: hr_new
tidbintranetappplatform:
driver-class-name: com.mysql.cj.jdbc.Driver
password: 9z_Bu28r1*DZ3K6@+a

15
src/main/resources/application-prod.yml
View File

@ -20,25 +20,24 @@ spring:
hrnew:
driver-class-name: com.mysql.cj.jdbc.Driver
password: kPMP6NafMsdccxDX
#url: jdbc:mysql://127.0.0.1:3306/hengxingaoke_tes?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
url: jdbc:mysql://127.0.0.1:3306/hr_new?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
url: jdbc:mysql://127.0.0.1:13366/hr_new?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
username: hr_new
tidbintranetappplatform:
driver-class-name: com.mysql.cj.jdbc.Driver
password: GJ8m6tXrSDL2SfA2
#url: jdbc:mysql://127.0.0.1:3306/hengxingaoke_tes?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
url: jdbc:mysql://127.0.0.1:3306/app_platform?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
#url: jdbc:mysql://127.0.0.1:3306/hengxingaoke_tes?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
url: jdbc:mysql://127.0.0.1:13366/app_platform?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
username: app_platform
systemempower:
driver-class-name: com.mysql.cj.jdbc.Driver
password: NTYni4L2mfxk5zZZ
url: jdbc:mysql://127.0.0.1:3306/system_empower?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
url: jdbc:mysql://127.0.0.1:13366/system_empower?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
username: system_empower
tidbintranetcustomerform:
driver-class-name: com.mysql.cj.jdbc.Driver
password: Mjh4msNtADGjiMaC
#url: jdbc:mysql://127.0.0.1:3306/hengxingaoke_tes?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
url: jdbc:mysql://127.0.0.1:3306/customer_form?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
#url: jdbc:mysql://127.0.0.1:3306/hengxingaoke_tes?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
url: jdbc:mysql://127.0.0.1:13366/customer_form?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false
username: customer_form
#数据源基础配置
druid:
@ -88,4 +87,4 @@ redisPool:
myProps:
qrcodePrefix: https://wab.hxgk.group/#/form_table/taskListPage?
gainTableVersionFieldUrl: http://36.133.126.182:39250/customer_form/gainTableVersionField
gainTableVersionFieldUrl: http://36.133.123.69:39250/customer_form/gainTableVersionField

4
src/main/resources/application.yml
View File

@ -1,5 +1,5 @@
spring:
profiles:
active: dev
active: prod
server:
port: 8112
port: 39999
Write Preview
Loading…
Cancel
Save