Pārlūkot izejas kodu

更新了swagger说明

wuweihao 2 mēneši atpakaļ
vecāks
revīzija
f1fdb433b8

+ 4 - 4
gis_application/src/main/resources/application-dev.properties

@@ -63,10 +63,10 @@ oss.file.path=${project.name}/
 oss.domain=http://ossxiaoan.4dage.com/
 
 # swagger2
-swagger.package=com.gis.web.controller
-swagger.title=\u7985\u9053 dev \u7985\u9053\u7BA1\u7406\u540E\u53F0
-swagger.description=\u7985\u9053 dev \u7985\u9053\u7BA1\u7406\u540E\u53F0
-swagger.version=1.0
+#swagger.package=com.gis.web.controller
+#swagger.title=\u7985\u9053 dev \u7985\u9053\u7BA1\u7406\u540E\u53F0
+#swagger.description=\u7985\u9053 dev \u7985\u9053\u7BA1\u7406\u540E\u53F0
+#swagger.version=1.0
 
 
 #log

+ 4 - 4
gis_application/src/main/resources/application-pro.properties

@@ -59,10 +59,10 @@ oss.file.path=${project.name}/
 oss.domain=http://ossxiaoan.4dage.com/
 
 # swagger2
-swagger.package=com.gis.web.controller
-swagger.title=\u7985\u9053 pro \u7985\u9053\u7BA1\u7406\u540E\u53F0
-swagger.description=\u7985\u9053 pro \u7985\u9053\u7BA1\u7406\u540E\u53F0
-swagger.version=1.0
+#swagger.package=com.gis.web.controller
+#swagger.title=\u7985\u9053 pro \u7985\u9053\u7BA1\u7406\u540E\u53F0
+#swagger.description=\u7985\u9053 pro \u7985\u9053\u7BA1\u7406\u540E\u53F0
+#swagger.version=1.0
 
 
 

+ 15 - 1
gis_application/src/main/resources/application.properties

@@ -1,10 +1,13 @@
 server.port=8085
 
 #spring.profiles.active=lorPro
-spring.profiles.active=dev
+spring.profiles.active=pro
 
 # \u9879\u76EE\u540D\u79F0
 project.name=zentao_age
+# \u9879\u76EE\u540D\u79F0
+project.en=zentao_age
+project.sc=\u7985\u9053\u5DE5\u65F6
 
 # \u8BBF\u95EE\u9759\u6001\u8D44\u6E90\u8BBE\u7F6E
 spring.resources.static-locations=classpath:templates/,classpath:static/,classpath:web/
@@ -27,5 +30,16 @@ pagehelper.params=count=countSql
 pagehelper.reasonable=false
 pagehelper.support-methods-arguments=true
 
+# druid\u63A7\u5236\u53F0\u8D26\u53F7\u5BC6\u7801, \u53EA\u5141\u8BB8127.0.0.1\u8BBF\u95EE
+spring.datasource.druid.stat-view-servlet.allow=127.0.0.1
+spring.datasource.druid.stat-view-servlet.login-username=owen
+spring.datasource.druid.stat-view-servlet.login-password=owen
+
+# swagger2 \u8BBE\u7F6E\u5168\u5C40\u5B57\u4F53\u683C\u5F0F\u4E3Autf-8
+swagger.package=com.gis
+swagger.title=${project.sc}-${spring.profiles.active}
+swagger.description=${project.sc}-${project.en}
+swagger.version=1.0
+
 
 

+ 1 - 1
gis_web/src/main/java/com/gis/web/controller/OpenApiController.java

@@ -46,7 +46,7 @@ public class OpenApiController extends BaseController {
     public Result<TaskestimateVo> getAllTaskestimate(@RequestBody DateDto2 param) {
         StringBuilder builder = new StringBuilder();
         builder.append("select a.account, a.date, ROUND(sum(a.consumed),2) as consumed, b.realname as name from zt_taskestimate a LEFT JOIN zt_user b on b.account=a.account ");
-        // 20258-3-20 需要join zt_task.deleted=0, 不然会跟个人工时统计数据会有出入(left=0)
+        // 2025-3-20 需要join zt_task.deleted=0, 不然会跟个人工时统计数据会有出入(left=0)
         builder.append(" LEFT JOIN zt_task c on c.id=a.task  where c.deleted = '0' and ");
         String startTime = param.getStartTime();
         String endTime = param.getEndTime();

+ 4 - 1
remark.md

@@ -70,4 +70,7 @@
    地址:/opt/tomcat/zentao_age_8085    
    
    使用nginx 访问外部静态资源   
-   sssss         
+   sssss         
+   
+   2025-6-11
+   http://192.168.0.115:8085/doc.html#/home