Skip to content

D
dsk-cr20g
Commit 500f07f8 authored by tanyang's avatar tanyang
Browse files
Options

Merge remote-tracking branch 'origin/master' into V20230915 

# Conflicts:
#	dsk-operate-ui/src/views/market/index.vue
parents ab968a5d 15c8d8cc
Hide whitespace changes
Inline Side-by-side
Showing with 132 additions and 36 deletions
docker-compose.yml 0 → 100644
View file @ 500f07f8
version: "3"
services:
dsk-operate-sys:
image: swr.cn-north-4.myhuaweicloud.com/dsk/java:8u111-jdk-alpine-creditreport
container_name: dsk-operate-sys
network_mode: host
restart: always
working_dir: /app
environment:
TZ: Asia/Shanghai
volumes:
- ./dsk-operate-sys:/app
- /etc/localtime:/etc/localtime
command: "java -jar dsk-operate-sys.jar"
nginx:
image: nginx:perl
container_name: nginx
restart: always
network_mode: host
working_dir: /app
environment:
TZ: Asia/Shanghai
volumes:
- /etc/localtime:/etc/localtime
- ./dsk-operate-ui/dist/:/www/szh/web/dist/
- ./dsk-operate-ui/operate.conf:/etc/nginx/conf.d/operate.conf
- ./dsk-operate-ui/log:/var/log/nginx
\ No newline at end of file
dsk-admin/Dockerfile deleted 100644 → 0
View file @ ab968a5d
FROM anapsix/alpine-java:8_server-jre_unlimited
MAINTAINER Tanyang
RUN mkdir -p /ruoyi/server/logs \
/ruoyi/server/temp \
/ruoyi/skywalking/agent
WORKDIR /ruoyi/server
ENV SERVER_PORT=8080
EXPOSE ${SERVER_PORT}
ADD ./target/dsk-operate-sys.jar ./dsk-operate-sys.jar
ENTRYPOINT ["java", \
"-Djava.security.egd=file:/dev/./urandom", \
"-Dserver.port=${SERVER_PORT}", \
# 应用名称 如果想区分集群节点监控 改成不同的名称即可
# "-Dskywalking.agent.service_name=ruoyi-server", \
# "-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar", \
"-jar", "dsk-operate-sys.jar"]
dsk-admin/pom.xml
View file @ 500f07f8
......@@ -61,6 +61,11 @@
<artifactId>dsk-biz-api</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
......
dsk-admin/src/main/resources/application-prod.yml
View file @ 500f07f8
......@@ -49,9 +49,12 @@ spring:
driverClassName: com.mysql.cj.jdbc.Driver
# jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
# rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
url: jdbc:mysql://192.168.0.79:3306/dsk_operate_sys?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: dev
password: 8AXjjCHZ666!
# url: jdbc:mysql://192.168.0.79:3306/dsk_operate_sys?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: dev
# password: 8AXjjCHZ666!
url: jdbc:mysql://rds-szh.dsk.com/dos?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: dsk_api_szh
password: j1nxbVPF0QS*B57C
# 从库数据源
# slave:
# lazy: true
......@@ -101,13 +104,13 @@ spring:
--- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
spring:
redis:
host: 192.168.0.79
host: redis-szh.dsk.com
# 端口，默认为6379
port: 6379
# 数据库索引
database: 6
# 密码
password: zfTFIJjaN#6xB83r
password: Xi8$r*@d7zn5FaP2
# 密码(如没有密码请注释掉)
# password:
# 连接超时时间
......
dsk-admin/src/main/resources/application.yml
View file @ 500f07f8
......@@ -107,7 +107,7 @@ sa-token:
# token名称 (同时也是cookie名称)
token-name: Authorization
# token有效期 设为一天 (必定过期) 单位: 秒
timeout: 18000
timeout: 28800
# 多端不同 token 有效期 可查看 LoginHelper.loginByDevice 方法自定义
# token最低活跃时间 (指定时间无操作就过期) 单位: 秒
active-timeout: 18000
......
dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/service/impl/EconomicServiceImpl.java
View file @ 500f07f8
......@@ -56,7 +56,8 @@ public class EconomicServiceImpl implements EconomicService {
if (ObjectUtil.isEmpty(dto.getYear())) {
dto.setYear(DateUtils.getYear() - 1);
}
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/economic/national/nationalPage", BeanUtil.beanToMap(dto, false, false));
Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/national/nationalPage", BeanUtil.beanToMap(dto, false, false));
Integer code = MapUtils.getInteger(map, "code", 300);
if (!code.equals(HttpStatus.OK.value())) {
throw new RuntimeException();
......
dsk-operate-ui/operate.conf 0 → 100644
View file @ 500f07f8
server
{
listen 80;
server_name hwszh.jiansheku.com szh.jiansheku.com;
index index.php index.html index.htm default.php default.htm default.html;
error_page 500 502 503 504 /50x.html;
access_log /var/log/nginx/szh.jiansheku.com.access.log;
error_log /var/log/nginx/szh.jiansheku.com.error.log;
location / {
root /www/szh/web/dist/;
index index.html index.htm;
try_files $uri $uri/ /index.html;
}
location /prod-api/ {
proxy_redirect off;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
# 后端服务地址
proxy_pass http://localhost:9098/;
}
location = /50x.html {
root html;
}
}
dsk-operate-ui/src/views/detail/party-b/index.vue
View file @ 500f07f8
......@@ -32,7 +32,7 @@
}
},
created() {
if(window.location.host === 'http://szh.jiansheku.com' || window.location.host === 'szh.jiansheku.com'){
if(window.location.host === 'http://szh.jiansheku.com' || window.location.host === 'szh.jiansheku.com'|| window.location.host === 'hwszh.jiansheku.com'){
this.domain='https://plug.jiansheku.com'
}else {
this.domain='https://pre-plug.jiansheku.com'
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/zhaobiao1.vue
View file @ 500f07f8
<template>
<div class="zhaobiao">
<p class="text_p">注：数据来源大司空建筑大数据平台，统计范围为全国公开的招标项目，未公开的不含在内</p>
<div class="zb-content content1">
<div class="flex-box query-box">
<div class="flex-box query-params">
......@@ -490,7 +489,7 @@ export default {
border-radius: 4px;
color: #0081FF;
}
.shangji{
.zhaobiao{
.zb-content{
background: #ffffff;
border-radius: 4px;
......
dsk-operate-ui/src/views/project/projectList/component/addContacts.vue 0 → 100644
View file @ 500f07f8
<template>
<el-dialog
class="popups"
:visible.sync="dialogVisible"
width="464px">
<div class="poptitle">
<img src="@/assets/images/economies/icon.png">
<span>{{projectname}}</span>
</div>
<el-form class="popform" label-width="137px">
<el-form-item label="联系人姓名：" class="row">
<el-input type="text" v-model="queryParam.name" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="联系人性别：" class="row">
<el-radio-group v-model="queryParam.sex">
<el-radio label=1>男</el-radio>
<el-radio label=0>女</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="联系人角色：" class="row">
<el-input type="text" v-model="queryParam.role" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="关联企业：" class="row">
<el-input type="text" v-model="queryParam.office" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="联系人职位：" class="row">
<el-input type="text" v-model="queryParam.position" placeholder="请输入"></el-input>
</el-form-item>
<!--<el-form-item label="内部维护人：" class="row">-->
<!--<el-input type="text" v-model="queryParam.accendant" placeholder="请输入"></el-input>-->
<!--</el-form-item>-->
<el-form-item label="联系方式：" class="row">
<el-input type="text" v-model="queryParam.phone" placeholder="请输入"></el-input>
</el-form-item>
<div class="popbot">
<div class="btn btn_cancel h32" @click="cancel">返回</div>
<div class="btn btn_primary h32" @click="save">保存</div>
</div>
</el-form>
</el-dialog>
</template>
<script>
import {editLXR,addLXR} from '@/api/project/project'
export default {
name: 'addContacts'
}
</script>
<style scoped>
</style>
dsk-operate-ui/src/views/project/projectList/component/gzdb.vue
View file @ 500f07f8
......@@ -23,7 +23,7 @@
</div>
<div class="sels">
<img src="@/assets/images/project/ico_2.png">
<el-input v-model="queryParam.target" placeholder="拜访对象" style="width: 100px;">
<el-input v-model="queryParam.target" placeholder="拜访对象" maxlength="500" style="width: 100px;">
</el-input>
</div>
<div class="wc">
......
dsk-operate-ui/vue.config.js
View file @ 500f07f8
......@@ -34,8 +34,8 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `http://47.104.91.229:9099/prod-api`,//测试
// target: `http://localhost:9099`,//测试
// target: `http://47.104.91.229:9099/prod-api`,//测试
target: `http://localhost`,//测试
// target: `http://122.9.160.122:9011`, //线上
// target: `http://192.168.0.165:9098`,//施
// target: `http://192.168.60.6:9098`,//谭
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment