部署方式

README.md

@@ -27,6 +27,14 @@
 ```
 # build
 gradlew build -x test
-# deploy
+# 发布
 gradlew publish -x test
+# 打包+发布release版本
+gradlew build publish -x test -PprojVersion='1.0.0'
+```
+
+### jenkins构建
+
+```
+http://10.10.100.200:5001/view/Uas/job/uas-office-integration/
 ```

build.gradle

@@ -9,6 +9,12 @@ allprojects {
 }
 
 subprojects { Project subproject ->
+    if (subproject.hasProperty('projVersion')) {
+        subproject.version = subproject.projVersion
+    } else {
+        subproject.version = '1.0.0-SNAPSHOT'
+    }
+    
     apply plugin: 'java'
     apply plugin: 'idea'
     apply plugin: 'maven'

uas-office-server/build.gradle

@@ -1,3 +1,5 @@
+apply plugin: 'org.springframework.boot'
+
 dependencies {
     compile project(':uas-office-qywx')
     compile project(':uas-office-dingtalk')

uas-office-server/src/main/resources/application.yaml

@@ -25,7 +25,7 @@ spring:
       max-lifetime: 1800000
       connection-timeout: 30000
   redis:
-    host: 10.1.81.2
+    host: 127.0.0.1
     port: 6379
   jackson:
     serialization:

uas-office-server/src/main/resources/static/dc.html

@@ -53,12 +53,19 @@
                     </div>
                 </div>
                 <div class="form-group row">
-                    <label class="col-sm-2 col-form-label" for="erpOuterUrlInput">系统外网地址</label>
+                    <label class="col-sm-2 col-form-label" for="erpOuterUrlInput">UAS系统外网地址</label>
                     <div class="col-sm-10">
                         <input type="text" class="form-control" id="erpOuterUrlInput" name="erpOuterUrl"
                                required>
                     </div>
                 </div>
+                <div class="form-group row">
+                    <label class="col-sm-2 col-form-label" for="outerUrlInput">Office对接外网地址</label>
+                    <div class="col-sm-10">
+                        <input type="text" class="form-control" id="outerUrlInput" name="outerUrl"
+                               required>
+                    </div>
+                </div>
                 <button type="button" class="btn btn-primary btn-save">保存</button>
             </form>
         </div>

uas-office-server/src/main/resources/static/js/dc.js

@@ -12,6 +12,7 @@ $(document).ready(function () {
                             $('#usernameInput').val(data.username);
                             $('#passwordInput').val(data.password);
                             $('#erpOuterUrlInput').val(data.erpOuterUrl);
+                            $('#outerUrlInput').val(data.outerUrl);
                         } else {
                             alert(content.message);
                         }