Prechádzať zdrojové kódy

新增状态变更记录

Jack 11 mesiacov pred
rodič
commit
4224993e5e

+ 28 - 14
.idea/workspace.xml

@@ -4,16 +4,8 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="ed63665b-8c5d-41ac-a75b-7a0cfc2d6ec5" name="Default Changelist" comment="增加添加站点对外接口">
-      <change afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/param/UpdateSiteParam.java" afterDir="false" />
+    <list default="true" id="ed63665b-8c5d-41ac-a75b-7a0cfc2d6ec5" name="Default Changelist" comment="新增状态变更记录">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/controller/OkkiSiteController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/controller/OkkiSiteController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/controller/ShopApiController.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/controller/ShopApiController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/entity/OkkiSite.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/entity/OkkiSite.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/param/ChangeSiteStatusParam.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/param/ChangeSiteStatusParam.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/service/IOkkiSiteService.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/service/IOkkiSiteService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/service/impl/OkkiSiteServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/service/impl/OkkiSiteServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/site/OkkiSite.data.ts" beforeDir="false" afterPath="$PROJECT_DIR$/jeecgboot-vue3/src/views/okki/site/OkkiSite.data.ts" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -72,7 +64,7 @@
     "Spring Boot.JeecgSystemApplication.executor": "Run",
     "git-widget-placeholder": "master",
     "kotlin-language-version-configured": "true",
-    "last_opened_file_path": "D:/ProjectsCode/okki-oms/jeecgboot-vue3/src/views/okki/site",
+    "last_opened_file_path": "D:/ProjectsCode/okki-oms/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/mapper/xml",
     "node.js.detected.package.eslint": "true",
     "node.js.detected.package.stylelint": "true",
     "node.js.detected.package.tslint": "true",
@@ -93,11 +85,16 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\ProjectsCode\okki-oms\jeecg-boot\jeecg-module-system\jeecg-system-biz\src\main\java\org\jeecg\modules\api\okki\site\mapper\xml" />
       <recent name="D:\ProjectsCode\okki-oms\jeecgboot-vue3\src\views\okki\site" />
       <recent name="D:\ProjectsCode\okki-oms\jeecgboot-vue3\src\views\okki\site\components" />
       <recent name="D:\ProjectsCode\okki-oms\jeecgboot-vue3\public\resource\img" />
       <recent name="D:\ProjectsCode\okki-oms\jeecgboot-vue3\src\assets\images" />
-      <recent name="D:\ProjectsCode\okki-oms\jeecgboot-vue3\src\assets\loginmini\icon" />
+    </key>
+    <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="org.jeecg.modules.api.okki.site.service" />
+      <recent name="org.jeecg.modules.api.okki.site.mapper" />
+      <recent name="org.jeecg.modules.api.okki.site.entity" />
     </key>
   </component>
   <component name="RunManager" selected="Spring Boot.JeecgSystemApplication">
@@ -151,7 +148,7 @@
       <workItem from="1714364142512" duration="1150000" />
       <workItem from="1714369560719" duration="12569000" />
       <workItem from="1714438904130" duration="33587000" />
-      <workItem from="1714957905106" duration="19768000" />
+      <workItem from="1714957905106" duration="25834000" />
     </task>
     <task id="LOCAL-00001" summary="增加添加站点对外接口">
       <option name="closed" value="true" />
@@ -265,7 +262,23 @@
       <option name="project" value="LOCAL" />
       <updated>1714472389381</updated>
     </task>
-    <option name="localTasksCounter" value="15" />
+    <task id="LOCAL-00015" summary="增加添加站点对外接口">
+      <option name="closed" value="true" />
+      <created>1714982618891</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1714982618891</updated>
+    </task>
+    <task id="LOCAL-00016" summary="新增状态变更记录">
+      <option name="closed" value="true" />
+      <created>1714988973801</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1714988973801</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -284,7 +297,8 @@
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="增加添加站点对外接口" />
-    <option name="LAST_COMMIT_MESSAGE" value="增加添加站点对外接口" />
+    <MESSAGE value="新增状态变更记录" />
+    <option name="LAST_COMMIT_MESSAGE" value="新增状态变更记录" />
   </component>
   <component name="XSLT-Support.FileAssociations.UIState">
     <expand />

+ 5 - 2
jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/okki/site/service/impl/OkkiSiteServiceImpl.java

@@ -10,6 +10,7 @@ import org.jeecg.modules.api.okki.site.mapper.OkkiSiteMapper;
 import org.jeecg.modules.api.okki.site.param.ChangeSiteStatusParam;
 import org.jeecg.modules.api.okki.site.service.IOkkiSiteService;
 import org.jeecg.modules.api.okki.site.service.IOkkiSiteStatusChangeLogService;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -35,9 +36,11 @@ import java.util.TreeMap;
 @Service
 public class OkkiSiteServiceImpl extends ServiceImpl<OkkiSiteMapper, OkkiSite> implements IOkkiSiteService {
 
-    private final static String URL = "https://cms.dev.xiaoman.cn/shop-api/External/site";
+    @Value("{$OKKI.BASE_URL}")
+    private String URL;
 
-    private final static String CLIENT_SECRET = "rAqZAp9oo0crNariGVVpt5AvPeVhCKXJ";
+    @Value("{$OKKI.CLIENT_SECRET}")
+    private String CLIENT_SECRET;
 
     @Resource
     private OkkiSiteMapper okkiSiteMapper;

+ 3 - 0
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -320,3 +320,6 @@ justauth:
     type: default
     prefix: 'demo::'
     timeout: 1h
+OKKI:
+  BASE_URL: https://cms.dev.xiaoman.cn/shop-api/External/site
+  CLIENT_SECRET : rAqZAp9oo0crNariGVVpt5AvPeVhCKXJ

+ 3 - 0
jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-prod.yml

@@ -307,3 +307,6 @@ justauth:
     type: default
     prefix: 'demo::'
     timeout: 1h
+OKKI:
+  BASE_URL: https://cms.xiaoman.cn/shop-api/External/site
+  CLIENT_SECRET : G8v7vplPP9cm7vgUFXqZJOB4TVjoomIy

+ 1 - 1
jeecgboot-vue3/src/views/okki/site/OkkiSiteList.vue

@@ -183,4 +183,4 @@
 
 <style scoped>
 
-</style>
+</style>