Parcourir la source

Merge branch 'dev-XC' into 'master'

Dev xc



See merge request !1

guochao il y a 3 ans
Parent
commit
7e533933d7
2 fichiers modifiés avec 41 ajouts et 23 suppressions
  1. 15 0
      readme.md
  2. 26 23
      src/main/resources/application.yml

+ 15 - 0
readme.md

@@ -0,0 +1,15 @@
+## 项目说明
+1. 项目名称:信创版众测服务的报告导出项目
+2. 项目分支:
+```$xslt
+dev-XC               开发版本
+PrivateReleaseOfXC   线上版本
+```
+3. 项目负责人:郭超
+4. 开发运行的环境:dev,开发时需要修改application.yml中export.path,改成本机的对应的文件夹。
+5. 安装部署:
+- 分支:PrivateReleaseOfXC
+- 环境:private-cloud
+```$xslt
+jenkins构建:http://116.62.172.121:8081/view/%E4%BC%97%E5%8C%85%E6%B5%8B%E8%AF%95/job/%E4%BF%A1%E5%88%9B%E6%8A%A5%E5%91%8A%E5%AF%BC%E5%87%BA%E7%A7%81%E6%9C%89%E4%BA%91/
+```

+ 26 - 23
src/main/resources/application.yml

@@ -1,23 +1,26 @@
-#spring.profiles.active: private-localhost
-spring.profiles.active: private-cloud
-
-server:
-  port: 9003
-
----
-spring:
-  profiles: private-localhost
-
-export:
-  path: /Users/guochao/Desktop/corwd-file/xinchuang/excel
-crowd:
-  frontend: http://127.0.0.1:5555
-
----
-spring:
-  profiles: private-cloud
-
-export:
-  path: /var/www/xinchuang/excel
-crowd:
-  frontend: http://192.168.31.157:81
+spring.profiles.active: dev
+#spring.profiles.active: private-cloud
+
+server:
+  port: 9003
+
+---
+spring:
+  profiles: dev
+
+export:
+  path: /Users/guochao/Desktop/xinchuang/excel
+
+# 跳转至众测服务前端
+crowd:
+  frontend: http://127.0.0.1:5555
+
+
+---
+spring:
+  profiles: private-cloud
+
+export:
+  path: /var/www/xinchuang/excel
+crowd:
+  frontend: http://192.168.31.157:81