adjust the configuration #206
Merged
+10
−10
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zchenxi
pushed a commit
that referenced
this pull request
Aug 9, 2022
* delete service ticketinfo (#178) * Station food (#177) * 修改station-food-service 主要是重命名 * 修改数据库名称 * 删除不必要的代码文件 * 修改quickstart-k8s中的mongo和service名 * 修改pom.xml * 修改父pom.xml * 修改url调用关系 * feat: 拆分ts-food-map-service为ts-trainfood-service (#179) * Log optimization 20220117 (#183) * log fixed by Chen Miao 0119 * log fixed by Tianyi Zhang 0120 * log fixed by Tianyi Zhang 0120-1 * log fixed by Tianyi Zhang 0120-2 * log fixed by Tianyi Zhang 0121-1 * Service access address configuration collation * nacos初步修改 (#181) * nacos初步修改 * nacos修改硬编码 * nacos k8s cluster * nacos 部署删除不必要文件 * Gateway (#185) * add gateway * fix gateway * fix: gateway中uri用通配符形式匹配 * use NACOS_ADDRS instead of ip Co-authored-by: wangyongli.0510 <wangyongli.0510@bytedance.com> Co-authored-by: Rananism <meixiezichuan@163.com> * 统一数据库为mongo * 版本问题修改 * 版本问题修改 * fix test error * fix dockerfile * nacos数据库修改 * fix gateway and trainFood * Cqq mysql (#187) * 改mysql yml * 改mysql * mysql train * mysql * mysql useSSL=false * update * Ws mysql (#188) * change to mysql yml * change to mysql yml * change to mysql ts-auth * change to mysql ts-auth * change to mysql ts-contacts * revert change to mysql ts-route * change to mysql ts-train * fix bug * change to mysql ts-user * change to mysql ts-consign-price * Update uuid length to 36 Co-authored-by: meixiezichuan <meixiezichuan@163.com> * Reconstruction (#190) * log fixed by Tianyi Zhang mysql modified for delivery-service * log fixed by Tianyi Zhang mysql modified * log fixed by Tianyi Zhang mysql modified * Reconstruction (#191) * log fixed by Tianyi Zhang mysql modified for delivery-service * log fixed by Tianyi Zhang mysql modified * log fixed by Tianyi Zhang mysql modified * fixed by Tianyi Zhang mysql modified * Hd mysql refactoring data access layer transfer to MySQL ts-route ts-food ts-security * mysql (#196) * reconstruction (#195) * reconstruction * reconstructionon_fixURL * adjust the configuration (#198) * Zbc mysql (#194) * ts-travel-service: migrate from mongo to mysql * ts-travel2-service: migrate from mogo to mysql * ts-train-food-service: migrate from mongo to mysql * Fix bug. * mysql modified * Modify mysql config. * adjust the configuration (#198) * ts-travel-service: migrate from mongo to mysql * ts-travel2-service: migrate from mogo to mysql * ts-train-food-service: migrate from mongo to mysql * Fix bug. * mysql modified * Modify mysql config. Co-authored-by: Kyle-Dwyer <34733051+Kyle-Dwyer@users.noreply.github.com> Co-authored-by: meixiezichuan <meixiezichuan@163.com> * Reconstruction (#193) * log fixed by Tianyi Zhang mysql modified for delivery-service * log fixed by Tianyi Zhang mysql modified * log fixed by Tianyi Zhang mysql modified * fixed by Tianyi Zhang mysql modified * fixed by Tianyi Zhang mysql modified * fixed by Tianyi Zhang mysql modified * fixed by Tianyi Zhang mysql modified * fixed by Tianyi Zhang mysql modified * update: mysql config in application.yml * Reconstruction (#204) * inside-payment stop * ts-gateway finished * mysql * change length * fix rabbitmq port type error * rm ts-nacos dir * Use discoveryClient in ts-admin-basic-info-service * Reconstruction (#205) * fixed by Tianyi Zhang mysql modified * adjust the configuration (#206) * Re cqq (#207) * mysql * fix ts-auth ts-consign-price ts-train ts-contacts ts-user * fix nacos related (#209) * fix ts-admin-* & basic & cancel & preserve & rebook to use discoveryclient * fix execute order order-other route-plan seat travel-plan * Fix nacos config. (#211) * Fix getServiceUrl * refactor: nacos config (#213) * fix getServiceUrl for food & security * update gateway service(fix dependency bugs & add sentinal flow control feature) (#212) * fix getServiceUrl for food & security * remove ribbon & openfeign * add dialect for mysql * add jakarta.validation dependency * fix admin-basic application.yaml * Add unique for index of consign price * fix delivery swagger version * fix order, order-other findById * fix payment * fix price findById * Fix entiry defination in payment, insidepsyment, train, travel, travel2 * fix price findById.get * update guava version in verfication-code to fix dependency error * fix station * Fix voucher to use mysql env * fix port type in mysql_config * Fix getServiceUrl and mysqlDriver * Fix route entity duplicated definition * Fix station findById get * Fix travel/travel2 check null before traverse list * remove duplicated Entity of Trip in travel2 * use trip2 in travel2 * add travel/travel2 repository bean * Data (#218) * Tidy data definition * tidy and formalize data * refactor: forwards the service request to Gateway (#217) * remove unique constraint of consign price * Feature update header (#219) * update header (add token) * update header (add token) * Prometheus skywalking (#208) * Add prometheus config. * Add skywalking config. * Change deployment yaml for skywalking. * fix auth-user and user to use same user_id * optimize travel and seat loop dependency * add orderColumn for route_stations and route_distances * rm auto genetate id for price * Modify gateway addr in nginx.conf * query basic infos by batch * feat: Modified the form for adding information and added options. (#221) * feat: Modified the form for adding information and added options. * fix: form for adding new travel. * Fix route plan and travel plan * Format startStation and end Station in route * update deployment file * fix admin bugs (#222) * update： Modified parameters of some interfaces. Updated descriptions of some forms. * fix ticket-office use mysql * user environment var of mysql * Fix trainfood stationFood * add quickstart-k8s deployment * Feature bugs fix (#223) * fix admin bugs * fix bugs * optimize seat Co-authored-by: meixiezichuan <meixiezichuan@163.com> * Fix food service * Ts food delivery service (#220) * Add ts-food-delivery-service. * Add ts-food-delivery-service * Add rpc to station-food-service. * Add rpc to station-food-service. * Test controller. * Solve reviewed problems. * Rename TripInfo. * fix stationfood url * Feature train update fix (#224) * update header (add token) * fix train update * Modify Date type to String * fix Order/Orderother about date type bug * fix: Complete front-end request parameters. (#225) fix: Front-end display problems. * fix travel update method * modify Date to String in Trip * Fix admin-route admin-travel add methoud * fix date type bug * set default price rate when priceconfig not found * edit deployment/ (#226) * edit deployment/ * edit ts-consign-price-mysql * Set tarvel date format yyyy-mm-dd hh:mm:ss * Fix bug in getTripAllDetailInfo * Add Release note 1.0 * Fix get seat bug in travel plan * Completed waiting order service， and modified some configuration files. (#229) * edit deployment/ * edit ts-consign-price-mysql * edit entity * change to Date * edit repository * feature: wait list order service * fix: Judgment of the waiting period * update: Modified configuration file of ts-wait-order-service. Co-authored-by: winterStreet <luwente@163.com> Co-authored-by: WinterStreett <53975807+WinterStreett@users.noreply.github.com> * docs(CHANGLOG-1.0.md) update sentinel part and bugfix part * Fix String2Date * fix contacts * update release note * modify pom * Add deploy file and doc * add nacos helm charts * Update deploy files * fix charts and yamls * update readme & changelog & deploy file * update architecute png * remove datasource from gateway * add sample file for deploy yamls Co-authored-by: Kyle-Dwyer <34733051+Kyle-Dwyer@users.noreply.github.com> Co-authored-by: cqqqqc <50789602+cqqqqc@users.noreply.github.com> Co-authored-by: Yongli0510 <1415193349@qq.com> Co-authored-by: SakuraX99 <57907184+SakuraX99@users.noreply.github.com> Co-authored-by: WangShang <1005284123@qq.com> Co-authored-by: wangyongli.0510 <wangyongli.0510@bytedance.com> Co-authored-by: 程千骞 <1617095973@qq.com> Co-authored-by: akasakaisami <akasaka0623@163.com> Co-authored-by: Deep-Yellow <957822635@qq.com> Co-authored-by: water423 <48052788+water423@users.noreply.github.com> Co-authored-by: zbcdd <52142931+zbcdd@users.noreply.github.com> Co-authored-by: Deep-Yellow <51702118+Deep-Yellow@users.noreply.github.com> Co-authored-by: WinterStreett <53975807+WinterStreett@users.noreply.github.com> Co-authored-by: winterStreet <luwente@163.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.